summaryrefslogtreecommitdiff
path: root/lib/puppet/provider/vcsrepo/hg.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/hg.rb
parent818734c0264ffbca9dacc59d358399d819e89ed8 (diff)
Bring stderr output to the Puppet visible output
Diffstat (limited to 'lib/puppet/provider/vcsrepo/hg.rb')
-rw-r--r--lib/puppet/provider/vcsrepo/hg.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb
index 294c2a9..b426963 100644
--- a/lib/puppet/provider/vcsrepo/hg.rb
+++ b/lib/puppet/provider/vcsrepo/hg.rb
@@ -122,7 +122,7 @@ Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) d
end
if @resource.value(:user) and @resource.value(:user) != Facter['id'].value
args.map! { |a| if a =~ /\s/ then "'#{a}'" else a end } # Adds quotes to arguments with whitespaces.
- Puppet::Util::Execution.execute("hg #{args.join(' ')}", :uid => @resource.value(:user), :failonfail => true)
+ Puppet::Util::Execution.execute("hg #{args.join(' ')}", :uid => @resource.value(:user), :failonfail => true, :combine => true)
else
hg(*args)
end