diff options
| author | Markus Roberts <Markus@reality.com> | 2009-12-18 14:55:37 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2009-12-18 14:55:37 -0800 |
| commit | 4226e018d7c8e2d52ef59edf37d3a320aa823be0 (patch) | |
| tree | b5b58e80927f96dc7758f8a0ab5a91f3da8b2b5b /lib/puppet | |
| parent | 8971d8beae2c409f9052f27c3f80ad3bdfff4de2 (diff) | |
| download | puppet-4226e018d7c8e2d52ef59edf37d3a320aa823be0.tar.gz puppet-4226e018d7c8e2d52ef59edf37d3a320aa823be0.tar.xz puppet-4226e018d7c8e2d52ef59edf37d3a320aa823be0.zip | |
Fix for #2959 (calling exit status on a nil report)
Signed-off-by: Markus Roberts <Markus@reality.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/application/puppetd.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb index c1f733183..4230719ad 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) |