summaryrefslogtreecommitdiff
path: root/lib/puppet/provider/vcsrepo/hg.rb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-09-28 11:59:41 +0200
committervarac <varacanero@zeromail.org>2016-09-28 11:59:41 +0200
commit2558e45a5fe0ff6990eb5b722e1ba867014a9788 (patch)
tree2b2264a1eb20a9df1f4f3b02c83a970f5911fcef /lib/puppet/provider/vcsrepo/hg.rb
parent4e23209eaccf1ab504d35158f4141b3053327c2f (diff)
parentcd6c3bc87e59bd51191c08515a7807071b3bb7a3 (diff)
Merge remote-tracking branch 'puppetlabs/master'HEADmaster
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