[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:31:19 UTC 2010


The following commit has been merged in the upstream branch:
commit 17bccb0ff3c340116cc17a83fda7b2747d2c93ae
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Apr 5 15:50:19 2010 -0700

    Restore noop non-behaviours
    
    In the #2759 series, noop was altering the synced timestamp and calling
    the flush() method on nooped resources. This patch prevents those things
    from happening.

diff --git a/lib/puppet/transaction/resource_harness.rb b/lib/puppet/transaction/resource_harness.rb
index 081e3b1..2a475a0 100644
--- a/lib/puppet/transaction/resource_harness.rb
+++ b/lib/puppet/transaction/resource_harness.rb
@@ -51,8 +51,10 @@ class Puppet::Transaction::ResourceHarness
             status.out_of_sync = true
             status.change_count = changes.length
             apply_changes(status, changes)
-            resource.cache(:synced, Time.now)
-            resource.flush if resource.respond_to?(:flush)
+            if ! resource.noop?
+                resource.cache(:synced, Time.now)
+                resource.flush if resource.respond_to?(:flush)
+            end
         end
         return status
     rescue => detail

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list