summaryrefslogtreecommitdiff
path: root/lib/puppet/provider/vcsrepo/cvs.rb
diff options
context:
space:
mode:
authorMarkus Frosch <markus@lazyfrosch.de>2016-02-16 15:08:11 +0100
committerMarkus Frosch <markus@lazyfrosch.de>2016-02-16 15:31:15 +0100
commit7fbbf2535c9a76b23efe6247d4a1cd4cdc299483 (patch)
treecdf2d882e0c16f131e57cb79b6b1e94d9f0ab607 /lib/puppet/provider/vcsrepo/cvs.rb
parent818734c0264ffbca9dacc59d358399d819e89ed8 (diff)
Bring stderr output to the Puppet visible output
Diffstat (limited to 'lib/puppet/provider/vcsrepo/cvs.rb')
-rw-r--r--lib/puppet/provider/vcsrepo/cvs.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb
index 7a8f6ef..e5bde7a 100644
--- a/lib/puppet/provider/vcsrepo/cvs.rb
+++ b/lib/puppet/provider/vcsrepo/cvs.rb
@@ -127,9 +127,9 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo)
if @resource.value(:user) and @resource.value(:user) != Facter['id'].value
Puppet.debug "Running as user " + @resource.value(:user)
- Puppet::Util::Execution.execute([:cvs, *args], :uid => @resource.value(:user), :custom_environment => e)
+ Puppet::Util::Execution.execute([:cvs, *args], :uid => @resource.value(:user), :custom_environment => e, :combine => true)
else
- Puppet::Util::Execution.execute([:cvs, *args], :custom_environment => e)
+ Puppet::Util::Execution.execute([:cvs, *args], :custom_environment => e, :combine => true)
end
end
end