summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorNigel Kersten <nigelk@google.com>2010-09-30 16:44:48 -0700
committerJames Turnbull <james@lovedthanlost.net>2010-11-10 06:25:56 +1100
commit00eedac5917fdc4ca5cee5c831e7f2e105a668a4 (patch)
treefd051b530fabf1e1f62ca8d18141ba21e91d99e0 /lib/puppet
parent4cbceab68f3d84b322d9b78ddb95c34615906bb9 (diff)
downloadpuppet-00eedac5917fdc4ca5cee5c831e7f2e105a668a4.tar.gz
puppet-00eedac5917fdc4ca5cee5c831e7f2e105a668a4.tar.xz
puppet-00eedac5917fdc4ca5cee5c831e7f2e105a668a4.zip
capture stderr from exec resources
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/suidmanager.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index 4d2c32217..6633de002 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -88,7 +88,7 @@ module Puppet::Util::SUIDManager
module_function :initgroups
def run_and_capture(command, new_uid=nil, new_gid=nil)
- output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
+ output = Puppet::Util.execute(command, :failonfail => false, :combine => true, :uid => new_uid, :gid => new_gid)
[output, $CHILD_STATUS.dup]
end
module_function :run_and_capture