summaryrefslogtreecommitdiffstats
path: root/lib/puppet/interface/option_manager.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/interface/option_manager.rb')
-rw-r--r--lib/puppet/interface/option_manager.rb4
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)