Fixing class storage -- it was not working for nodescopes

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@858 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 2 insertions, 10 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 942c417a2..7bb9f6b3b 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -68,22 +68,14 @@ module Puppet
                         end
 
                         # We've already evaluated the AST, in this case
-                        retval = @scope.evalnode(names, facts)
-                        if classes = @scope.classlist
-                            retval.classes = classes
-                        end
-                        return retval
+                        return @scope.evalnode(names, facts)
                     else
                         # We've already evaluated the AST, in this case
                         @scope = Puppet::Parser::Scope.new() # no parent scope
                         @scope.interp = self
                         @scope.type = "puppet"
                         @scope.name = "top"
-                        retval = @scope.evaluate(@ast, facts, @classes)
-                        if classes = @scope.classlist
-                            retval.classes = classes + @classes
-                        end
-                        return retval
+                        return @scope.evaluate(@ast, facts, @classes)
                     end
                     #@ast.evaluate(@scope)
                 rescue Puppet::DevError, Puppet::Error, Puppet::ParseError => except