diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:20:27 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:20:45 -0700 |
| commit | d5db8db116aff58215ab0feebd7ec02086040f51 (patch) | |
| tree | 58489a37bd0ee14b3d053a0e23f9638b4f6205e7 /lib/puppet/application.rb | |
| parent | 865282ae7b9332fdbdfa51b2814755b8a13d244b (diff) | |
| parent | b53e7d78e2e87571ae53170e9716b9ccd75da6e2 (diff) | |
| download | puppet-d5db8db116aff58215ab0feebd7ec02086040f51.tar.gz puppet-d5db8db116aff58215ab0feebd7ec02086040f51.tar.xz puppet-d5db8db116aff58215ab0feebd7ec02086040f51.zip | |
Merge branch 'next'
This synchronizes the 2.7 master branch with 2.6.1RC1
Diffstat (limited to 'lib/puppet/application.rb')
| -rw-r--r-- | lib/puppet/application.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index 05b7d466f..0a8fbc155 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -264,7 +264,6 @@ class Application self.send(fname, value) end end - @option_parser.default_argv = self.command_line.args @option_parser end @@ -337,7 +336,7 @@ class Application # scan command line argument begin - self.option_parser.parse! + self.option_parser.parse!(self.command_line.args) rescue OptionParser::ParseError => detail $stderr.puts detail $stderr.puts "Try 'puppet #{command_line.subcommand_name} --help'" |