summaryrefslogtreecommitdiffstats
path: root/bin/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-03 17:31:57 -0500
committerLuke Kanies <luke@madstop.com>2007-10-03 17:31:57 -0500
commit5d50ca790e7f752e07da84197b52ff84d2dcfdb4 (patch)
treee2a6da756a53347ed5d33de7f89040222279a449 /bin/puppet
parentb727a95aa4b72ce057653101cf1f50fa49c4b0a8 (diff)
downloadpuppet-5d50ca790e7f752e07da84197b52ff84d2dcfdb4.tar.gz
puppet-5d50ca790e7f752e07da84197b52ff84d2dcfdb4.tar.xz
puppet-5d50ca790e7f752e07da84197b52ff84d2dcfdb4.zip
Fixing #814 -- when files are missing, the exceptions should
now be more reasonable.
Diffstat (limited to 'bin/puppet')
-rwxr-xr-xbin/puppet6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/puppet b/bin/puppet
index deeb65c42..a87a07619 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -197,13 +197,13 @@ begin
config = client.getconfig
config.apply
rescue => detail
+ if Puppet[:trace]
+ puts detail.backtrace
+ end
if detail.is_a?(XMLRPC::FaultException)
$stderr.puts detail.message
else
$stderr.puts detail
end
- if Puppet[:trace]
- puts detail.backtrace
- end
exit(1)
end