Mostly fixing exec so it either captures stderr or runs as a user; Process.euid was not working correctly

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@743 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 2 insertions, 14 deletions

diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index 6169bde81..e5179a587 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -19,9 +19,9 @@ module Util
                 if group.is_a?(Integer)
                     gid = group
                 else
-                    unless obj = Puppet::Type::Group[user]
+                    unless obj = Puppet::Type::Group[group]
                         obj = Puppet::Type::Group.create(
-                            :name => user,
+                            :name => group,
                             :check => [:gid]
                         )
                     end
@@ -85,18 +85,6 @@ module Util
         return retval
     end
 
-    # Capture stderr of a block
-    def self.capture_stderr
-        require 'stringio'
-        begin
-            $stderr = StringIO.new
-            yield
-            $stderr.rewind && $stderr.read
-        ensure
-            $stderr = STDERR
-        end
-    end
-
     # Create instance methods for each of the log levels.  This allows
     # the messages to be a little richer.  Most classes will be calling this
     # method.