From b65fb8316e10fb31c4ac9d0af75bb3e7f452d312 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Tue, 13 Nov 2007 10:34:50 -0600 Subject: Fixing a parser test -- really, just removing tests that belong with the AST classes rather than in the parser. Yeah, these tests need to be rewritten. Committed on an airplane. :) --- lib/puppet/parser/ast/astarray.rb | 1 + lib/puppet/parser/ast/hostclass.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/puppet/parser') diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb index 9a2dc286c..5f1e838d0 100644 --- a/lib/puppet/parser/ast/astarray.rb +++ b/lib/puppet/parser/ast/astarray.rb @@ -49,6 +49,7 @@ class Puppet::Parser::AST end end } + rets = [settors, others].flatten.collect { |child| child.safeevaluate(:scope => scope) } diff --git a/lib/puppet/parser/ast/hostclass.rb b/lib/puppet/parser/ast/hostclass.rb index 9c039bb49..d4904bebf 100644 --- a/lib/puppet/parser/ast/hostclass.rb +++ b/lib/puppet/parser/ast/hostclass.rb @@ -26,7 +26,7 @@ class Puppet::Parser::AST # Verify that we haven't already been evaluated. This is # what provides the singleton aspect. if existing_scope = scope.compile.class_scope(self) - Puppet.debug "%s class already evaluated" % @type + Puppet.debug "Class '%s' already evaluated; not evaluating again" % (classname == "" ? "main" : classname) return nil end -- cgit