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/hg.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/hg.rb')
| -rw-r--r-- | lib/puppet/provider/vcsrepo/hg.rb | 2 |
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 |