okay, file sourcing actually seems to work now

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

1 files changed, 14 insertions, 10 deletions

diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 82164a25c..166cfc0e5 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -766,13 +766,14 @@ class Type < Puppet::Element
 
         changes = []
         # collect all of the changes from children and states
-        if self.class.depthfirst?
-            changes << self.collect { |child|
-                child.evaluate
-            }
-        end
+        #if self.class.depthfirst?
+        #    changes << self.collect { |child|
+        #        child.evaluate
+        #    }
+        #end
 
         # this only operates on states, not states + children
+        Puppet.warning "Calling retrieve on %s" % self.name
         self.retrieve
         unless self.insync?
             # add one to the number of out-of-sync instances
@@ -786,11 +787,14 @@ class Type < Puppet::Element
             }
         end
 
-        unless self.class.depthfirst?
-            changes << self.collect { |child|
-                child.evaluate
-            }
-        end
+        changes << @children.collect { |child|
+            child.evaluate
+        }
+        #unless self.class.depthfirst?
+        #    changes << self.collect { |child|
+        #        child.evaluate
+        #    }
+        #end
         # collect changes and return them
         # these changes could be from child objects or from contained states
         #self.collect { |child|