diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-07-10 13:04:20 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-07-10 13:04:20 -0700 |
| commit | b7ee0258ab40478329c20177eda9b250f27ede18 (patch) | |
| tree | b3ecb26b570730e825c0a4005913ff7370511477 /lib/puppet/interface | |
| parent | 8fe2e555ac3d57f5b6503ffe1a5466db8d6e190a (diff) | |
| parent | ae3ef423c03b7ef27f975dadfb67bf77ca481503 (diff) | |
| download | puppet-b7ee0258ab40478329c20177eda9b250f27ede18.tar.gz puppet-b7ee0258ab40478329c20177eda9b250f27ede18.tar.xz puppet-b7ee0258ab40478329c20177eda9b250f27ede18.zip | |
Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into 2.7.x
* ticket/2.7.x/7699_fix_help_listing_options_twice:
(#7699) - Help should only show options once
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 |