summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/ast/collexpr.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/parser/ast/collexpr.rb b/lib/puppet/parser/ast/collexpr.rb
index e9f2e63e0..5fb11c709 100644
--- a/lib/puppet/parser/ast/collexpr.rb
+++ b/lib/puppet/parser/ast/collexpr.rb
@@ -44,8 +44,10 @@ class CollExpr < AST::Branch
case @oper
when "and", "or":
- raise Puppet::ParseError, "Puppet does not currently support collecting exported resources with more than one condition"
- #oper = @oper.upcase
+ if form == :exported
+ raise Puppet::ParseError, "Puppet does not currently support collecting exported resources with more than one condition"
+ end
+ oper = @oper.upcase
when "==": oper = "="
else
oper = @oper