summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Martin <max@puppetlabs.com>2011-04-28 13:50:12 -0700
committerMax Martin <max@puppetlabs.com>2011-04-28 13:50:12 -0700
commit28920686e93a367e7de02cbd9c22a90b036091ed (patch)
treef2ea3399fc4a5ce4c0e4e91705f2489172c6b91f
parentc4a2647ad58fbe809822e399042454627066f65b (diff)
parent1b2a7d90af49b19409dcb151f922f124f797a290 (diff)
downloadpuppet-28920686e93a367e7de02cbd9c22a90b036091ed.tar.gz
puppet-28920686e93a367e7de02cbd9c22a90b036091ed.tar.xz
puppet-28920686e93a367e7de02cbd9c22a90b036091ed.zip
Merge branch 'ticket/2.6.next/6844' into 2.6.next
* ticket/2.6.next/6844: case seems needless here as there is only two opts, also the rest of the file seems to use if so this should make things more consistant
-rw-r--r--lib/puppet.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index a9ed2898c..f97d28642 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -59,8 +59,7 @@ module Puppet
# configuration parameter access and stuff
def self.[](param)
- case param
- when :debug
+ if param == :debug
return Puppet::Util::Log.level == :debug
else
return @@settings[param]