summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/functions.rb2
-rw-r--r--lib/puppet/parser/scope.rb1
2 files changed, 2 insertions, 1 deletions
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?