diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-15 15:34:24 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-15 15:34:24 -0700 |
| commit | 0d0318f9f0eadff7f9934d3d02a7081bba05164c (patch) | |
| tree | dfc6b3d976ac5acf822846c272bdb4451b10aeba /lib/puppet/interface/option_manager.rb | |
| parent | 3fe01a34e8397c30a00e7d47b4ac0b93198e1fcf (diff) | |
| parent | d80500f42367fa30a00dc12ef4b32b55b350b1ca (diff) | |
| download | puppet-0d0318f9f0eadff7f9934d3d02a7081bba05164c.tar.gz puppet-0d0318f9f0eadff7f9934d3d02a7081bba05164c.tar.xz puppet-0d0318f9f0eadff7f9934d3d02a7081bba05164c.zip | |
Merge branch 'feature/2.7.x/6978-face-and-action-options-should-have-hooks-for-various-actions' into 2.7.x
Diffstat (limited to 'lib/puppet/interface/option_manager.rb')
| -rw-r--r-- | lib/puppet/interface/option_manager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/interface/option_manager.rb b/lib/puppet/interface/option_manager.rb index 56df9760f..d42359c07 100644 --- a/lib/puppet/interface/option_manager.rb +++ b/lib/puppet/interface/option_manager.rb @@ -37,10 +37,10 @@ module Puppet::Interface::OptionManager result.sort end - def get_option(name) + def get_option(name, with_inherited_options = true) @options ||= {} result = @options[name.to_sym] - unless result then + if result.nil? and with_inherited_options then if self.is_a?(Class) and superclass.respond_to?(:get_option) result = superclass.get_option(name) elsif self.class.respond_to?(:get_option) |