[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:34:21 UTC 2010


The following commit has been merged in the upstream branch:
commit bbba9f9f52b71c0402a297b3d738aee0cc75b348
Author: David Schmitt <david at dasz.at>
Date:   Fri May 14 11:07:19 2010 +0200

    Avoid trying to set uid/gid on windows

diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index 6f09005..f8dbca7 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -50,7 +50,8 @@ 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 unless root?
+        return yield if Puppet.features.win32? or !root?
+
         # We set both because some programs like to drop privs, i.e. bash.
         old_uid, old_gid = self.uid, self.gid
         old_euid, old_egid = self.euid, self.egid

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list