diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-13 15:01:13 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-13 15:01:13 -0700 |
| commit | a8e4df735abcbb61915c28378f2fd045bdcdeb42 (patch) | |
| tree | a05a61d4ca514ef466bccc8217a6d61b5cd4ca4c /lib/puppet/interface/action_builder.rb | |
| parent | 82fb02ce27c95d8326335a8d52a9ab7e676fe8d3 (diff) | |
| parent | 4b7afaa065383c4a441068a15f97ab82d2ebd3fc (diff) | |
| download | puppet-a8e4df735abcbb61915c28378f2fd045bdcdeb42.tar.gz puppet-a8e4df735abcbb61915c28378f2fd045bdcdeb42.tar.xz puppet-a8e4df735abcbb61915c28378f2fd045bdcdeb42.zip | |
Merge branch '2.7.next' into next
* 2.7.next:
Revert "(#7220) Add the ability to "inherit" options."
(#7469) Add license to test face so tests pass
(#7264) Docs: Clarify that subscribe/notify imply require/before
(#7468) Stub spec that tries to connect to pypi.python.org
Prevent spec failure caused by network device mock leak
Fix #7299 - do not require net/ssh for running rake spec
Diffstat (limited to 'lib/puppet/interface/action_builder.rb')
| -rw-r--r-- | lib/puppet/interface/action_builder.rb | 10 |
1 files changed, 0 insertions, 10 deletions
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 |