Doing more work on #113. Mostly, just making sure remounts do not happen spuriously very often. They will still have extra remounts when changing the value of "ensure", but that is not currently avoidable (similar to #199).

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

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index f3662ccfe..2240ca19f 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -84,10 +84,12 @@ class Transaction
                 resource.flush
             end
             
-            # And set a trigger for refreshing this resource if it's a self-refresher
-            if resource.self_refresh?
-                # Create an edge with this resource as both the source and target.  The triggering
-                # method treats these specially for logging.
+            # And set a trigger for refreshing this resource if it's a
+            # self-refresher
+            if resource.self_refresh? and ! resource.deleting?
+                # Create an edge with this resource as both the source and
+                # target.  The triggering method treats these specially for
+                # logging.
                 set_trigger(Puppet::Relationship.new(resource, resource, :callback => :refresh, :event => :ALL_EVENTS))
             end
         end