From 1808c50ea15f48eab7110f34685fbb4c84b6a00a Mon Sep 17 00:00:00 2001 From: luke Date: Thu, 1 Mar 2007 17:41:00 +0000 Subject: Apparently the include function was not failing when it could not find asked-for classes. Now it does. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2250 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/parser/functions.rb | 2 +- lib/puppet/parser/scope.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/puppet/parser') diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 288a3bd68..0b94ca76e 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -110,7 +110,7 @@ module Functions klasses = evalclasses(*vals) missing = vals.find_all do |klass| - ! klass.include?(klass) + ! klasses.include?(klass) end # Throw an error if we didn't evaluate all of the classes. diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 6bb8872ee..e81862dad 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -195,6 +195,7 @@ class Puppet::Parser::Scope retval << klass end end + retval end def exported? -- cgit