summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2009-11-19 12:34:40 -0800
committerJames Turnbull <james@lovedthanlost.net>2009-11-20 07:54:39 +1100
commit8129caabdab73fca8b4b8de0ecafe4c0dd31cc95 (patch)
tree23fab5a58b34430f069ff73f9ef68eb2c95d3719 /lib/puppet
parente32f980fd7c6291abc2841ede397c962798d9a9c (diff)
downloadpuppet-8129caabdab73fca8b4b8de0ecafe4c0dd31cc95.tar.gz
puppet-8129caabdab73fca8b4b8de0ecafe4c0dd31cc95.tar.xz
puppet-8129caabdab73fca8b4b8de0ecafe4c0dd31cc95.zip
Fix for ticket #2700 -- check for @explicit_waitforcert in puppetd --test
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/application/puppetd.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 56aaf9370..37a5d003d 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.