[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 8129caabdab73fca8b4b8de0ecafe4c0dd31cc95
Author: Markus Roberts <Markus at reality.com>
Date:   Thu Nov 19 12:34:40 2009 -0800

    Fix for ticket #2700 -- check for @explicit_waitforcert in puppetd --test

diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 56aaf93..37a5d00 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -125,7 +125,7 @@ Puppet::Application.new(:puppetd) do
         Puppet.settings.handlearg("--no-daemonize")
         options[:verbose] = true
         options[:onetime] = true
-        options[:waitforcert] = 0
+        options[:waitforcert] = 0 unless @explicit_waitforcert
     end
 
     # Handle the logging settings.

-- 
Puppet packaging for Debian