diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-08-29 22:31:22 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-08-29 22:31:22 +0000 |
| commit | 062906591bc21d761ed00d33f9fa95c425b16ccd (patch) | |
| tree | 78b572ef620644f0a07dddb4404bcdad678c06a2 /bin | |
| parent | 82ac86e1996e156eb98bb0b06a8926ec61c8fdcc (diff) | |
fixing puppet to use correct method and adding a real test case for it
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@605 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppet | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/puppet b/bin/puppet index b86d578aa..d4ad1af8f 100755 --- a/bin/puppet +++ b/bin/puppet @@ -25,7 +25,8 @@ # Print this help message # # logfile:: -# Where to send messages. Defaults to sending messages to the console. +# Where to send messages. Choose between syslog, the console, and a log file. +# Defaults to sending messages to the console. # # = Example # @@ -56,7 +57,7 @@ end result = GetoptLong.new( [ "--debug", "-d", GetoptLong::NO_ARGUMENT ], [ "--help", "-h", GetoptLong::NO_ARGUMENT ], - [ "--logfile", "-l", GetoptLong::REQUIRED_ARGUMENT ], + [ "--logdest", "-l", GetoptLong::REQUIRED_ARGUMENT ], [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ], [ "--version", "-V", GetoptLong::NO_ARGUMENT ] ) @@ -82,7 +83,7 @@ begin verbose = true when "--debug" debug = true - when "--logfile" + when "--logdest" # FIXME we should be able to have log.rb check the validity of the dst case arg when "syslog", "console", /^\//: @@ -127,7 +128,7 @@ end begin client.getconfig - client.config + client.apply rescue => detail Puppet.err detail exit(1) |