summaryrefslogtreecommitdiffstats
path: root/lib/puppet.rb
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2010-06-30 12:19:29 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-01 13:48:03 -0700
commit75e0662168936da8255507a10bccad8889326947 (patch)
tree93e30eb595a8d49f00c02634cfa5be3d4dc6f14a /lib/puppet.rb
parent3cd48d836c9ffe4e59bca78f1033020cecf63354 (diff)
downloadpuppet-75e0662168936da8255507a10bccad8889326947.tar.gz
puppet-75e0662168936da8255507a10bccad8889326947.tar.xz
puppet-75e0662168936da8255507a10bccad8889326947.zip
[#4090] Rename mode (:master, :agent, :user) to run_mode
Mode is a terribly overused word. Files use it, puppetdoc uses it, and certs use it, and those are just the places that I happened to stumble upon. It makes reading code very confusing and finding things in code difficult. I know namespacing allows us to reuse words for method and variable names, but that doesn't mean we should.
Diffstat (limited to 'lib/puppet.rb')
-rw-r--r--lib/puppet.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index a039d258b..4e496e7ba 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -91,9 +91,9 @@ module Puppet
@@settings
end
- def self.mode
- require 'puppet/util/mode'
- $puppet_application_mode ||= Puppet::Util::Mode.new( :user )
+ def self.run_mode
+ require 'puppet/util/run_mode'
+ $puppet_application_mode ||= Puppet::Util::RunMode.new( :user )
end
def self.application_name