diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-06 12:09:09 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 15:50:50 -0700 |
| commit | d63fc34d0c6fdfbe72dafdf5d07a6cc9c6dd388e (patch) | |
| tree | 85791c5b0b4776e0a83b4c14547863564b40ea8c /lib | |
| parent | c21539fe2205fc61ca9e0a49b3b2702e76931632 (diff) | |
| download | puppet-d63fc34d0c6fdfbe72dafdf5d07a6cc9c6dd388e.tar.gz puppet-d63fc34d0c6fdfbe72dafdf5d07a6cc9c6dd388e.tar.xz puppet-d63fc34d0c6fdfbe72dafdf5d07a6cc9c6dd388e.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/interface/action.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/interface/action_builder.rb | 10 |
2 files changed, 0 insertions, 15 deletions
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb index 114e5341b..622371a4e 100644 --- a/lib/puppet/interface/action.rb +++ b/lib/puppet/interface/action.rb @@ -254,11 +254,6 @@ WRAPPER option end - def inherit_options_from(action) - options = action.options.map { |opt| action.get_option(opt, false) } - options.reject!(&:nil?).uniq.each { |option| add_option(option) } - end - def option?(name) @options_hash.include? name.to_sym end 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 |
