summaryrefslogtreecommitdiffstats
path: root/lib/puppet/interface/action.rb
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2011-07-10 13:51:31 -0700
committerJeff McCune <jeff@puppetlabs.com>2011-07-10 13:51:31 -0700
commit1feccc3f2db29d112308a55032e7f93ca44b45aa (patch)
treed5a5060944d69303deda8ce7b0b8fd85b853b747 /lib/puppet/interface/action.rb
parentb7ee0258ab40478329c20177eda9b250f27ede18 (diff)
downloadpuppet-1feccc3f2db29d112308a55032e7f93ca44b45aa.tar.gz
puppet-1feccc3f2db29d112308a55032e7f93ca44b45aa.tar.xz
puppet-1feccc3f2db29d112308a55032e7f93ca44b45aa.zip
Revert "Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into 2.7.x"
This reverts commit b7ee0258ab40478329c20177eda9b250f27ede18, reversing changes made to 8fe2e555ac3d57f5b6503ffe1a5466db8d6e190a.
Diffstat (limited to 'lib/puppet/interface/action.rb')
-rw-r--r--lib/puppet/interface/action.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb
index fe77a9658..185302b07 100644
--- a/lib/puppet/interface/action.rb
+++ b/lib/puppet/interface/action.rb
@@ -227,9 +227,8 @@ WRAPPER
end
end
- @options << option.name
-
option.aliases.each do |name|
+ @options << name
@options_hash[name] = option
end