summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/ast
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-10-18 00:22:45 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-10-18 00:22:45 +0000
commitf1ebef038b12231e876510c7247a82f6367a8d45 (patch)
tree88b5b0c1496f32a47eac7dadaff6fa0c5421811c /lib/puppet/parser/ast
parent52105c61ac135cc197910fc3a6c32d43fa8ce6cd (diff)
Fixing virtual object collection. I apparently broke it when I added rails collection back, and I never created any end-to-end tests.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1805 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/ast')
-rw-r--r--lib/puppet/parser/ast/collection.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/ast/collection.rb b/lib/puppet/parser/ast/collection.rb
index fa480b179..c817b5c5e 100644
--- a/lib/puppet/parser/ast/collection.rb
+++ b/lib/puppet/parser/ast/collection.rb
@@ -13,12 +13,12 @@ class Collection < AST::Branch
scope = hash[:scope]
if self.query
- q = self.query.safeevaluate :scope => scope
+ str, code = self.query.safeevaluate :scope => scope
else
- q = nil
+ str = code = nil
end
- newcoll = Puppet::Parser::Collector.new(scope, @type, q, self.form)
+ newcoll = Puppet::Parser::Collector.new(scope, @type, str, code, self.form)
scope.newcollection(newcoll)