summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Fields <travis@puppetlabs.com>2014-10-24 16:41:05 -0700
committerTravis Fields <travis@puppetlabs.com>2014-10-24 16:41:05 -0700
commit9dea09297956f6f7ac0a75e83e9f3e2e5681432c (patch)
treed8c1250bc6670ccd6253d594f095ba33804a882a
parentf0b207c03587f5c92915f86051dc139b939c53c0 (diff)
parent759cbdec886bebb859d8def9323c139faf99c024 (diff)
downloadpuppet-stdlib-9dea09297956f6f7ac0a75e83e9f3e2e5681432c.tar.gz
puppet-stdlib-9dea09297956f6f7ac0a75e83e9f3e2e5681432c.tar.bz2
Merge branch '4.3.x', add tempfile back for resource validate_cmd and validate_augeas
-rw-r--r--lib/puppet/parser/functions/validate_augeas.rb2
-rw-r--r--lib/puppet/parser/functions/validate_cmd.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/parser/functions/validate_augeas.rb b/lib/puppet/parser/functions/validate_augeas.rb
index 154d660..4ea4fe0 100644
--- 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
index 2ebe91c..652aa55 100644
--- 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|