summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/functions/require.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@reductivelabs.com>2009-12-21 16:27:34 -0800
committerLuke Kanies <luke@reductivelabs.com>2009-12-21 16:27:34 -0800
commitd921c459c14f7460fb209dea3b9194c91fee9fd1 (patch)
tree44783bcb3377b25da9e9283922617e06d471f2ad /lib/puppet/parser/functions/require.rb
parent4226e018d7c8e2d52ef59edf37d3a320aa823be0 (diff)
parent740fd6b301af89ab3aad89bca183ad1fcdc24ac4 (diff)
downloadpuppet-d921c459c14f7460fb209dea3b9194c91fee9fd1.tar.gz
puppet-d921c459c14f7460fb209dea3b9194c91fee9fd1.tar.xz
puppet-d921c459c14f7460fb209dea3b9194c91fee9fd1.zip
Merge branch 'merge'
Diffstat (limited to 'lib/puppet/parser/functions/require.rb')
-rw-r--r--lib/puppet/parser/functions/require.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb
index 3a2032d7f..d72169af5 100644
--- a/lib/puppet/parser/functions/require.rb
+++ b/lib/puppet/parser/functions/require.rb
@@ -27,7 +27,10 @@ Note that this function only works with clients 0.25 and later, and it will
fail if used with earlier clients.
") do |vals|
- send(:function_include, vals)
+ # Verify that the 'include' function is loaded
+ method = Puppet::Parser::Functions.function(:include)
+
+ send(method, vals)
if resource.metaparam_compatibility_mode?
warning "The 'require' function is only compatible with clients at 0.25 and above; including class but not adding dependency"
else