Merge branch '4.3.x', add tempfile back for resource validate_cmd and validate_augeas

Travis Fields · Travis Fields · commit 9dea09297956 · 2014-10-24T16:41:05.000-07:00
diff --git a/lib/puppet/parser/functions/validate_augeas.rb b/lib/puppet/parser/functions/validate_augeas.rb
@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Puppet::Parser::Functions
   newfunction(:validate_augeas, :doc => <<-'ENDHEREDOC') do |args|
     Perform validation of a string using an Augeas lens
diff --git a/lib/puppet/parser/functions/validate_cmd.rb b/lib/puppet/parser/functions/validate_cmd.rb
@@ -1,4 +1,5 @@
 require 'puppet/util/execution'
+require 'tempfile'
 
 module Puppet::Parser::Functions
   newfunction(:validate_cmd, :doc => <<-'ENDHEREDOC') do |args|

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+require 'tempfile'`
	`2`	`+`
`1`	`3`	`module Puppet::Parser::Functions`
`2`	`4`	`newfunction(:validate_augeas, :doc => <<-'ENDHEREDOC') do \|args\|`
`3`	`5`	`Perform validation of a string using an Augeas lens`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require 'puppet/util/execution'`
	`2`	`+require 'tempfile'`
`2`	`3`
`3`	`4`	`module Puppet::Parser::Functions`
`4`	`5`	`newfunction(:validate_cmd, :doc => <<-'ENDHEREDOC') do \|args\|`