Fixing transaction support for prefetching generated resources.

Previously, we prefetched then generated, which caused generated
resources that needed prefetching not to work.  This just reorders
the calls, so generated resources now get prefetched.

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 14b2037f4..b191f8219 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -499,10 +499,12 @@ class Transaction
     
     # Prepare to evaluate the resources in a transaction.
     def prepare
-        prefetch()
-    
         # Now add any dynamically generated resources
         generate()
+
+        # Then prefetch.  It's important that we generate and then prefetch,
+        # so that any generated resources also get prefetched.
+        prefetch()
         
         # This will throw an error if there are cycles in the graph.
         @sorted_resources = relationship_graph.topsort