From 1feccc3f2db29d112308a55032e7f93ca44b45aa Mon Sep 17 00:00:00 2001 From: Jeff McCune Date: Sun, 10 Jul 2011 13:51:31 -0700 Subject: 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. --- lib/puppet/interface/action.rb | 3 +-- lib/puppet/interface/option_manager.rb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/puppet/interface') 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 diff --git a/lib/puppet/interface/option_manager.rb b/lib/puppet/interface/option_manager.rb index a1f300e8e..326a91d92 100644 --- a/lib/puppet/interface/option_manager.rb +++ b/lib/puppet/interface/option_manager.rb @@ -26,9 +26,8 @@ module Puppet::Interface::OptionManager end end - @options << option.name - option.aliases.each do |name| + @options << name @options_hash[name] = option end -- cgit