summaryrefslogtreecommitdiffstats
path: root/bin/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-09-06 18:45:41 -0500
committerLuke Kanies <luke@madstop.com>2007-09-06 18:45:41 -0500
commit653c1514b613f27cb22d24b4bdd7b6c118047566 (patch)
tree54fadb5316bed0637e646c1e6f9ad09077416435 /bin/puppet
parent40e3b372ec2a3b45a5254a85f9b808bf3450e316 (diff)
downloadpuppet-653c1514b613f27cb22d24b4bdd7b6c118047566.tar.gz
puppet-653c1514b613f27cb22d24b4bdd7b6c118047566.tar.xz
puppet-653c1514b613f27cb22d24b4bdd7b6c118047566.zip
Fixing #806. Resources correctly look up their fully qualified definition type, just like resource references do, which causes the resource and reference to again agree on the full name of a given defined type.
Diffstat (limited to 'bin/puppet')
-rwxr-xr-xbin/puppet6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/puppet b/bin/puppet
index b158226ba..36f0fcd62 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -197,7 +197,11 @@ begin
client.getconfig
client.apply
rescue => detail
- $stderr.puts detail
+ if detail.is_a?(XMLRPC::FaultException)
+ $stderr.puts detail.message
+ else
+ $stderr.puts detail
+ end
if Puppet[:trace]
puts detail.backtrace
end