I had to redo how the scopes handled collectable objects (which I will soon change to being called "exported objects"). All seems to work now, though.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1192 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/puppet/parser/ast/component.rb b/lib/puppet/parser/ast/component.rb
index 5cf3f5c57..317c8ced5 100644
--- a/lib/puppet/parser/ast/component.rb
+++ b/lib/puppet/parser/ast/component.rb
@@ -10,7 +10,7 @@ class Puppet::Parser::AST
         # The class name
         @name = :component
 
-        attr_accessor :type, :args, :code, :scope, :keyword
+        attr_accessor :type, :args, :code, :scope, :keyword, :collectable
 
         #def evaluate(scope,hash,objtype,objname)
         def evaluate(hash)
@@ -19,6 +19,8 @@ class Puppet::Parser::AST
             objname = hash[:name]
             arguments = hash[:arguments] || {}
 
+            @collectable = hash[:collectable]
+
             pscope = origscope
             #pscope = if ! Puppet[:lexical] or hash[:asparent] == false
             #    origscope
@@ -32,6 +34,10 @@ class Puppet::Parser::AST
             )
             newcontext = hash[:newcontext]
 
+            if @collectable or origscope.collectable
+                scope.collectable = true
+            end
+
             unless self.is_a? AST::HostClass and ! newcontext
                 #scope.warning "Setting context to %s" % self.object_id
                 scope.context = self.object_id