summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/collector.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-13 20:29:00 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-13 20:29:00 +1100
commitd3959c497f4c61995f664d88aa3386b54c4baf8d (patch)
tree1a83a85c0c6d626781cad5632db146aeae49d0c9 /lib/puppet/parser/collector.rb
parentc3ead0331adba5f60ea7d508775a89de68e26caa (diff)
parentbcb9b564281003e22d72752d84fa9dc9c8c7107b (diff)
downloadpuppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.tar.gz
puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.tar.xz
puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.zip
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/parser/collector.rb')
-rw-r--r--lib/puppet/parser/collector.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb
index b8165a84f..e0c37cd35 100644
--- a/lib/puppet/parser/collector.rb
+++ b/lib/puppet/parser/collector.rb
@@ -118,20 +118,20 @@ class Puppet::Parser::Collector
# If there are no more resources to find, delete this from the list
# of collections.
if @resources.empty?
- @scope.compile.delete_collection(self)
+ @scope.compiler.delete_collection(self)
end
return result
end
- # Collect just virtual objects, from our local compile.
+ # Collect just virtual objects, from our local compiler.
def collect_virtual(exported = false)
if exported
method = :exported?
else
method = :virtual?
end
- scope.compile.resources.find_all do |resource|
+ scope.compiler.resources.find_all do |resource|
resource.type == @type and resource.send(method) and match?(resource)
end
end
@@ -150,7 +150,7 @@ class Puppet::Parser::Collector
resource.exported = false
- scope.compile.store_resource(scope, resource)
+ scope.compiler.add_resource(scope, resource)
return resource
end