[#4213] -o option for setting onetime now works properly

When onetime was moved to global defaults, it broke the option handler
using it in agent to manage waitforcert length. Additionally, it
caused --onetime and -o to behave differently. This patch removes
the ordinary option handler defined in agent and moves the logic
for waitforcert to the one location it's used.

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 0af40f2cb..84e2d93fc 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -54,10 +54,11 @@ module Puppet
       "Whether Puppet should manage the owner, group, and mode of files
       it uses internally"
       ],
-    :onetime => [false,
-      "Run the configuration once, rather than as a long-running
-      daemon. This is useful for interactively running puppetd."
-      ],
+    :onetime => {:default => false,
+      :desc => "Run the configuration once, rather than as a long-running
+      daemon. This is useful for interactively running puppetd.",
+      :short => 'o'
+      },
     :path => {:default => "none",
       :desc => "The shell search path.  Defaults to whatever is inherited
         from the parent process.",