summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2013-02-05 09:01:48 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2013-02-06 18:03:11 +0100
commit683ac8f8aa5f349ece98165d92a8d271b99b855e (patch)
tree4a57f604278711ee1f586b7bf558514ebda7d776 /lib/puppet/parser/functions
parentbda25ac0872a101b59d8ab473218ff0f14bb7433 (diff)
downloadpuppet-stdlib-683ac8f8aa5f349ece98165d92a8d271b99b855e.tar.gz
puppet-stdlib-683ac8f8aa5f349ece98165d92a8d271b99b855e.tar.bz2
validate_cmd: Use Puppet::Util.execute
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r--lib/puppet/parser/functions/validate_cmd.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/puppet/parser/functions/validate_cmd.rb b/lib/puppet/parser/functions/validate_cmd.rb
index 00fe1ae..4f6a766 100644
--- a/lib/puppet/parser/functions/validate_cmd.rb
+++ b/lib/puppet/parser/functions/validate_cmd.rb
@@ -1,3 +1,5 @@
+require 'puppet/util/execution'
+
module Puppet::Parser::Functions
newfunction(:validate_cmd, :doc => <<-'ENDHEREDOC') do |args|
Perform validation of a string with an external command.
@@ -30,15 +32,12 @@ module Puppet::Parser::Functions
tmpfile = Tempfile.new("validate_cmd")
begin
tmpfile.write(content)
- output = `#{checkscript} #{tmpfile.path} 2>&1 1>/dev/null`
- r = $?
+ Puppet::Util.execute("#{checkscript} #{tmpfile.path}")
+ rescue Puppet::ExecutionFailure => detail
+ msg += "\n#{detail}"
+ raise Puppet::ParseError, msg
ensure
- tmpfile.close
tmpfile.unlink
end
- if output
- msg += "\nOutput is:\n#{output}"
- end
- raise Puppet::ParseError, (msg) unless r == 0
end
end