summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/ast.rb3
-rw-r--r--lib/puppet/parser/ast/selector.rb5
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb
index 4c5226108..6d84e6402 100644
--- a/lib/puppet/parser/ast.rb
+++ b/lib/puppet/parser/ast.rb
@@ -79,6 +79,9 @@ module Puppet
error.line ||= @line
error.file ||= @file
error.backtrace = detail.backtrace
+ if Puppet[:debug]
+ puts detail.backtrace
+ end
raise error
end
end
diff --git a/lib/puppet/parser/ast/selector.rb b/lib/puppet/parser/ast/selector.rb
index 3adf0261c..5d1c41494 100644
--- a/lib/puppet/parser/ast/selector.rb
+++ b/lib/puppet/parser/ast/selector.rb
@@ -19,7 +19,10 @@ class Puppet::Parser::AST
default = nil
- @values = [@values] unless @values.instance_of? AST::ASTArray
+ #@values = [@values] unless @values.instance_of? AST::ASTArray
+ unless @values.instance_of? AST::ASTArray or @values.instance_of? Array
+ @values = [@values]
+ end
# Then look for a match in the options.
@values.each { |obj|