diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/application.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/run_mode.rb | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index af1bd8da9..2e0066ca1 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -93,7 +93,7 @@ module Puppet def self.run_mode require 'puppet/util/run_mode' - $puppet_application_mode || Puppet::Util::RunMode.new( :user ) + $puppet_application_mode || Puppet::Util::RunMode[:user] end def self.application_name diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index c49f42fd7..8aa3708aa 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -228,7 +228,7 @@ class Application return @run_mode if @run_mode and not mode_name require 'puppet/util/run_mode' - @run_mode = Puppet::Util::RunMode.new( mode_name || :user ) + @run_mode = Puppet::Util::RunMode[ mode_name || :user ] end end diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb index 08f2c851f..029c1f921 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb @@ -5,8 +5,14 @@ module Puppet @name = name.to_sym end + @@run_modes = Hash.new {|h, k| h[k] = RunMode.new(k)} + attr :name + def self.[](name) + @@run_modes[name] + end + def master? name == :master end |