[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Luke Kanies]

The following commit has been merged in the upstream branch:
commit d921c459c14f7460fb209dea3b9194c91fee9fd1
Merge: 4226e018d7c8e2d52ef59edf37d3a320aa823be0 740fd6b301af89ab3aad89bca183ad1fcdc24ac4
Author: Luke Kanies <luke at reductivelabs.com>
Date:   Mon Dec 21 16:27:34 2009 -0800

    Merge branch 'merge'

diff --combined lib/puppet/application/puppetd.rb
index 4230719,9302cf1..c99b9ea
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@@ -114,9 -114,7 +114,9 @@@ Puppet::Application.new(:puppetd) d
              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)
@@@ -139,7 -137,7 +139,7 @@@
          options[:verbose] = true
          options[:onetime] = true
          options[:detailed_exitcodes] = true
-         options[:waitforcert] = 0
+         options[:waitforcert] = 0 unless @explicit_waitforcert
      end
  
      # Handle the logging settings.
@@@ -174,13 -172,6 +174,6 @@@
              exit(14)
          end
  
-         # FIXME: we should really figure out how to distribute the CRL
-         # to clients. In the meantime, we just disable CRL checking if
-         # the CRL file doesn't exist
-         unless File::exist?(Puppet[:cacrl])
-             Puppet[:cacrl] = 'false'
-         end
- 
          handlers = nil
  
          if options[:serve].empty?

-- 
Puppet packaging for Debian