diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-19 18:12:20 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-19 18:12:20 +0000 |
| commit | b9dd7ee7e2bf296a8551942c12d6b69624b4457f (patch) | |
| tree | 22d068ee4f8a60bfaf63296e711c7e926b386876 /lib/puppet/parser | |
| parent | 5d7c5c9cad2b2a32e0aa7ff619cdae4916dbbf6e (diff) | |
| download | puppet-b9dd7ee7e2bf296a8551942c12d6b69624b4457f.tar.gz puppet-b9dd7ee7e2bf296a8551942c12d6b69624b4457f.tar.xz puppet-b9dd7ee7e2bf296a8551942c12d6b69624b4457f.zip | |
The first round of bug-fixes in preparation for beaker
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2714 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/ast/collexpr.rb | 6 |
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 |