diff options
| author | Dan Bode <dan@puppetlabs.com> | 2011-07-15 14:51:25 -0700 |
|---|---|---|
| committer | Dan Bode <dan@puppetlabs.com> | 2011-07-15 14:51:25 -0700 |
| commit | 756314da4e48b8a138a1e38f1ae276d6721ef410 (patch) | |
| tree | aa0675aedd35be1940f010e0ba33c5072a45ba2c /lib | |
| parent | 833edd0abaa13cd71da0d200b593f3f63bc4b7b9 (diff) | |
| parent | b82f29c61aa84a12fc208487e4b049cb24702261 (diff) | |
| download | puppet-756314da4e48b8a138a1e38f1ae276d6721ef410.tar.gz puppet-756314da4e48b8a138a1e38f1ae276d6721ef410.tar.xz puppet-756314da4e48b8a138a1e38f1ae276d6721ef410.zip | |
Merge branch 'issue/2.7.x/7699' into 2.7.x
Diffstat (limited to 'lib')
| -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 |