From d63fc34d0c6fdfbe72dafdf5d07a6cc9c6dd388e Mon Sep 17 00:00:00 2001 From: Daniel Pittman Date: Fri, 6 May 2011 12:09:09 -0700 Subject: Revert "(#7220) Add the ability to "inherit" options." This reverts commit 9329a1f33b4d7df81ad8661de74f8a3656428570. Conflicts: spec/unit/interface/action_builder_spec.rb spec/unit/interface/action_spec.rb --- lib/puppet/interface/action_builder.rb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'lib/puppet/interface/action_builder.rb') diff --git a/lib/puppet/interface/action_builder.rb b/lib/puppet/interface/action_builder.rb index ba5531f1d..62db8de06 100644 --- a/lib/puppet/interface/action_builder.rb +++ b/lib/puppet/interface/action_builder.rb @@ -31,16 +31,6 @@ class Puppet::Interface::ActionBuilder @action.add_option(option) end - def inherit_options_from(action) - if action.is_a? Symbol - name = action - action = @face.get_action(name) or - raise ArgumentError, "This Face has no action named #{name}!" - end - - @action.inherit_options_from(action) - end - def default(value = true) @action.default = !!value end -- cgit