[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1456-g2f0b1e5

[Luke Kanies]

The following commit has been merged in the upstream branch:
commit 09fb3f707dfce31a11eda2f35bd77e65c911c15f
Author: Luke Kanies <luke at madstop.com>
Date:   Mon Oct 26 20:39:41 2009 -0700

    Fixing #2752 - "require" loads "include"
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb
index 3a2032d..d72169a 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
diff --git a/spec/unit/parser/functions/require.rb b/spec/unit/parser/functions/require.rb
index 24c9ecc..577a52a 100755
--- a/spec/unit/parser/functions/require.rb
+++ b/spec/unit/parser/functions/require.rb
@@ -31,6 +31,12 @@ describe "the require function" do
         @scope.function_require("myclass")
     end
 
+    it "should verify the 'include' function is loaded" do
+        Puppet::Parser::Functions.expects(:function).with(:include).returns(:function_include)
+        @scope.stubs(:function_include)
+        @scope.function_require("myclass")
+    end
+
     it "should include the class but not add a dependency if used on a client not at least version 0.25" do
         @resource.expects(:metaparam_compatibility_mode?).returns true
         @scope.expects(:warning)

-- 
Puppet packaging for Debian