Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/4.3.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis Fields committed Oct 29, 2014
2 parents 88b6b29 + 385f009 commit 12f7344
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions lib/puppet/parser/functions/validate_cmd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ module Puppet::Parser::Functions
rescue Puppet::ExecutionFailure => detail
msg += "\n#{detail}"
raise Puppet::ParseError, msg
rescue SystemCallError => detail
msg += "\nWin32::Process::SystemCallError #{detail}"
raise Puppet::ParseError, msg
ensure
tmpfile.unlink
end
Expand Down

0 comments on commit 12f7344

Please sign in to comment.