diff options
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/run_mode.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/util/suidmanager.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb index fe9e07c85..bf745743f 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb @@ -27,14 +27,14 @@ module Puppet def conf_dir which_dir( - (Puppet.features.win32? ? File.join(Dir::WINDOWS, "puppet", "etc") : "/etc/puppet"), + (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "etc") : "/etc/puppet"), "~/.puppet" ) end def var_dir which_dir( - (Puppet.features.win32? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/lib/puppet"), + (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/lib/puppet"), "~/.puppet/var" ) end diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb index f8dbca79e..777c36411 100644 --- a/lib/puppet/util/suidmanager.rb +++ b/lib/puppet/util/suidmanager.rb @@ -50,7 +50,7 @@ module Puppet::Util::SUIDManager # Runs block setting uid and gid if provided then restoring original ids def asuser(new_uid=nil, new_gid=nil) - return yield if Puppet.features.win32? or !root? + return yield if Puppet.features.microsoft_windows? or !root? # We set both because some programs like to drop privs, i.e. bash. old_uid, old_gid = self.uid, self.gid |