diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-18 15:17:03 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-18 15:17:03 -0700 |
| commit | fd6f5b2478efa1864c090545d7ff063b74e0956c (patch) | |
| tree | a30977985e2851213bf2feb4394040c5bdb4ea84 /lib | |
| parent | 4d4d587db224544fe4d4d04351a14ed19039e1d3 (diff) | |
| parent | cbc123c2641f1c51a71710ea5dac5f6114063d34 (diff) | |
| download | puppet-fd6f5b2478efa1864c090545d7ff063b74e0956c.tar.gz puppet-fd6f5b2478efa1864c090545d7ff063b74e0956c.tar.xz puppet-fd6f5b2478efa1864c090545d7ff063b74e0956c.zip | |
Merge branch '2.6.x' into 2.7.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/indirector/exec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/indirector/exec.rb b/lib/puppet/indirector/exec.rb index 4683eda0f..8ea13ff95 100644 --- a/lib/puppet/indirector/exec.rb +++ b/lib/puppet/indirector/exec.rb @@ -16,8 +16,8 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus private # Proxy the execution, so it's easier to test. - def execute(command) - Puppet::Util.execute(command) + def execute(command, arguments) + Puppet::Util.execute(command,arguments) end # Call the external command and see if it returns our output. @@ -33,7 +33,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus # Add our name to it. external_command << name begin - output = execute(external_command) + output = execute(external_command, :combine => false) rescue Puppet::ExecutionFailure => detail raise Puppet::Error, "Failed to find #{name} via exec: #{detail}" end |