diff options
| author | Dan Bode <dan@puppetlabs.com> | 2011-07-13 15:38:32 -0700 |
|---|---|---|
| committer | Dan Bode <dan@puppetlabs.com> | 2011-07-13 15:38:32 -0700 |
| commit | b82f29c61aa84a12fc208487e4b049cb24702261 (patch) | |
| tree | 13940fcc93d0409a648511b18478cf073717d58d /lib/puppet/interface | |
| parent | 8730b290c4f45f3f76d57d2648bfb642528d0762 (diff) | |
| download | puppet-b82f29c61aa84a12fc208487e4b049cb24702261.tar.gz puppet-b82f29c61aa84a12fc208487e4b049cb24702261.tar.xz puppet-b82f29c61aa84a12fc208487e4b049cb24702261.zip | |
(#7699) Help command should only list options once
The problem was caused by the fact that the
options method returns a list of options that
treated the aliases as seperate options.
The fix is to only maintain a list of options
and not add all aliases to the options list.
Diffstat (limited to 'lib/puppet/interface')
| -rw-r--r-- | lib/puppet/interface/action.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/interface/option_manager.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb index 185302b07..fe77a9658 100644 --- a/lib/puppet/interface/action.rb +++ b/lib/puppet/interface/action.rb @@ -227,8 +227,9 @@ WRAPPER end end + @options << option.name + option.aliases.each do |name| - @options << name @options_hash[name] = option end diff --git a/lib/puppet/interface/option_manager.rb b/lib/puppet/interface/option_manager.rb index 326a91d92..a1f300e8e 100644 --- a/lib/puppet/interface/option_manager.rb +++ b/lib/puppet/interface/option_manager.rb @@ -26,8 +26,9 @@ module Puppet::Interface::OptionManager end end + @options << option.name + option.aliases.each do |name| - @options << name @options_hash[name] = option end |