validate_cmd: Make sure tmpfile is always closed and unlinked

2013-01-18 21:29:29 +01:00 · 2013-01-18 21:29:29 +01:00 · bda25ac087
commit bda25ac087
parent f6a63eeafa
1 changed files with 8 additions and 5 deletions
--- a/lib/puppet/parser/functions/validate_cmd.rb
+++ b/lib/puppet/parser/functions/validate_cmd.rb
@ -28,11 +28,14 @@ module Puppet::Parser::Functions

    # Test content in a temporary file
    tmpfile = Tempfile.new("validate_cmd")
-    tmpfile.write(content)
-    tmpfile.close
-    output = `#{checkscript} #{tmpfile.path} 2>&1 1>/dev/null`
-    r = $?
-    File.delete(tmpfile.path)
+    begin
+      tmpfile.write(content)
+      output = `#{checkscript} #{tmpfile.path} 2>&1 1>/dev/null`
+      r = $?
+    ensure
+      tmpfile.close
+      tmpfile.unlink
+    end
    if output
      msg += "\nOutput is:\n#{output}"
    end