diff options
| author | Travis Fields <travis@puppetlabs.com> | 2014-10-30 10:23:12 -0700 |
|---|---|---|
| committer | Travis Fields <travis@puppetlabs.com> | 2014-10-30 10:23:12 -0700 |
| commit | 35c2dc7ca340c106872459788c167d04140158ca (patch) | |
| tree | bc426e277a7f8d0c17dde3fee1a4cfd9123be0f4 /lib/puppet/parser | |
| parent | 12f734476c3e61f86d22b5fe0a4466edeb937b63 (diff) | |
| parent | 0db72ea777145cb69ce66dca3ae0ee5746c26934 (diff) | |
| download | puppet-stdlib-35c2dc7ca340c106872459788c167d04140158ca.tar.gz puppet-stdlib-35c2dc7ca340c106872459788c167d04140158ca.tar.bz2 | |
Merge branch '4.3.x'
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/functions/validate_cmd.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/validate_cmd.rb b/lib/puppet/parser/functions/validate_cmd.rb index c855c7e..c6136a5 100644 --- a/lib/puppet/parser/functions/validate_cmd.rb +++ b/lib/puppet/parser/functions/validate_cmd.rb @@ -42,8 +42,8 @@ module Puppet::Parser::Functions rescue Puppet::ExecutionFailure => detail msg += "\n#{detail}" raise Puppet::ParseError, msg - rescue SystemCallError => detail - msg += "\nWin32::Process::SystemCallError #{detail}" + rescue Exception => detail + msg += "\n#{detail.class.name} #{detail}" raise Puppet::ParseError, msg ensure tmpfile.unlink |