diff options
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/rdoc/generators/puppet_generator.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/settings.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/util/rdoc/generators/puppet_generator.rb b/lib/puppet/util/rdoc/generators/puppet_generator.rb index 614c8ccec..a956241a0 100644 --- a/lib/puppet/util/rdoc/generators/puppet_generator.rb +++ b/lib/puppet/util/rdoc/generators/puppet_generator.rb @@ -873,7 +873,7 @@ module Generators def find_symbol(symbol, method=nil) res = @context.parent.find_symbol(symbol, method) - res = res.viewer if res + res &&= res.viewer res end diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 7c70dfa8f..80cab1976 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -137,7 +137,7 @@ class Puppet::Util::Settings # Handle a command-line argument. def handlearg(opt, value = nil) @cache.clear - value = munge_value(value) if value + value &&= munge_value(value) str = opt.sub(/^--/,'') bool = true @@ -658,7 +658,7 @@ if @config.include?(:run_mode) def uninterpolated_value(param, environment = nil) param = param.to_sym - environment = environment.to_sym if environment + environment &&= environment.to_sym # See if we can find it within our searchable list of values val = catch :foundval do @@ -682,7 +682,7 @@ if @config.include?(:run_mode) # in which to search before the other configuration sections. def value(param, environment = nil) param = param.to_sym - environment = environment.to_sym if environment + environment &&= environment.to_sym # Short circuit to nil for undefined parameters. return nil unless @config.include?(param) |