diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2016-03-24 10:50:36 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2016-03-24 10:50:36 -0700 |
| commit | 81d5cff2741a10dc9a3e2c3ba6cfcdc22da6b73b (patch) | |
| tree | 0a049e1eaf51c09744fde9b66839cde08121797c /lib/puppet/provider/vcsrepo/cvs.rb | |
| parent | 6262d046c6993a6ae7112746210b91d46f94165e (diff) | |
| parent | 7fbbf2535c9a76b23efe6247d4a1cd4cdc299483 (diff) | |
Merge pull request #284 from lazyfrosch/stderr
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.rb | 4 |
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 |