[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35
Markus Roberts
Markus at reality.com
Wed Jul 14 10:29:39 UTC 2010
The following commit has been merged in the upstream branch:
commit 4226e018d7c8e2d52ef59edf37d3a320aa823be0
Author: Markus Roberts <Markus at reality.com>
Date: Fri Dec 18 14:55:37 2009 -0800
Fix for #2959 (calling exit status on a nil report)
Signed-off-by: Markus Roberts <Markus at reality.com>
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index c1f7331..4230719 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -114,7 +114,9 @@ Puppet::Application.new(:puppetd) do
Puppet.err detail.to_s
end
- if not Puppet[:noop] and options[:detailed_exitcodes] then
+ if not report
+ exit(1)
+ elsif not Puppet[:noop] and options[:detailed_exitcodes] then
exit(report.exit_status)
else
exit(0)
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list