From 145c39c79dfb6f235579f93ff85c54930d00920f Mon Sep 17 00:00:00 2001
From: lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Mon, 19 Mar 2007 22:18:35 +0000
Subject: Don't clobber an explicitly given waitforcert

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2331 980ebf18-57e1-0310-9a29-db15c13687c0
---
 bin/puppetd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/puppetd b/bin/puppetd
index be8af2287..8124a301d 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -195,6 +195,7 @@ options = {
 }
 
 begin
+    explicit_waitforcert = false
     result.each { |opt,arg|
         case opt
             # First check to see if the argument is a valid configuration parameter;
@@ -243,7 +244,7 @@ begin
                 options[:client] = false
             when "--onetime"
                 options[:onetime] = true
-                options[:waitforcert] = 0
+                options[:waitforcert] = 0 unless explicit_waitforcert
             when "--port"
                 args[:Port] = arg
             when "--logdest"
@@ -255,6 +256,7 @@ begin
                 end
             when "--waitforcert"
                 options[:waitforcert] = arg.to_i
+                explicit_waitforcert = true
             else
                 Puppet.config.handlearg(opt, arg)
         end
-- 
cgit