summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormccune <mccune@980ebf18-57e1-0310-9a29-db15c13687c0>2007-04-04 21:35:00 +0000
committermccune <mccune@980ebf18-57e1-0310-9a29-db15c13687c0>2007-04-04 21:35:00 +0000
commitb8b14d35276e97c39992b6bf619d4e8135f78294 (patch)
tree278c488929c58ba1dd902bd18924c8fdfc86ca21
parentefe9a833c43358e23ae252456a07b37cc9904a0a (diff)
downloadpuppet-b8b14d35276e97c39992b6bf619d4e8135f78294.tar.gz
puppet-b8b14d35276e97c39992b6bf619d4e8135f78294.tar.xz
puppet-b8b14d35276e97c39992b6bf619d4e8135f78294.zip
Forgot to change Puppet::Util::SUIDManager#run_and_capture arguments to execute
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2387 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--lib/puppet/util/suidmanager.rb2
-rwxr-xr-x[-rw-r--r--]test/puppet/modules.rb0
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index 7a0c3ae2c..80b1f4088 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -64,7 +64,7 @@ module Puppet::Util::SUIDManager
def run_and_capture(command, new_uid=nil, new_gid=nil)
output = nil
- output = Puppet::Util.execute(command, false, new_uid, new_gid)
+ output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
[output, $?.dup]
end
diff --git a/test/puppet/modules.rb b/test/puppet/modules.rb
index e652182a8..e652182a8 100644..100755
--- a/test/puppet/modules.rb
+++ b/test/puppet/modules.rb