diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-18 16:18:04 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-18 16:18:04 -0700 |
| commit | 696ba50accc6a5b99180d5284ea729107daec080 (patch) | |
| tree | bce81d3a6a1de19529f82e881f624668dfa4a82f /lib/puppet | |
| parent | fa2010b13835e6d0a4a624def24dcf1f22f6a411 (diff) | |
| parent | df20513122354deccd4ee4477a15cb70c5d605c6 (diff) | |
| download | puppet-696ba50accc6a5b99180d5284ea729107daec080.tar.gz puppet-696ba50accc6a5b99180d5284ea729107daec080.tar.xz puppet-696ba50accc6a5b99180d5284ea729107daec080.zip | |
Merge branch 'ticket/2.6.next/6658' into 2.6.next
* ticket/2.6.next/6658:
(#6658) Propagate ENC connection errors to the agent
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/indirector/exec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/indirector/exec.rb b/lib/puppet/indirector/exec.rb index fa789442b..4683eda0f 100644 --- a/lib/puppet/indirector/exec.rb +++ b/lib/puppet/indirector/exec.rb @@ -35,8 +35,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus begin output = execute(external_command) rescue Puppet::ExecutionFailure => detail - Puppet.err "Failed to find #{name} via exec: #{detail}" - return nil + raise Puppet::Error, "Failed to find #{name} via exec: #{detail}" end if output =~ /\A\s*\Z/ # all whitespace |