From 17bccb0ff3c340116cc17a83fda7b2747d2c93ae Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Mon, 5 Apr 2010 15:50:19 -0700 Subject: 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. --- lib/puppet/transaction/resource_harness.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/puppet/transaction/resource_harness.rb b/lib/puppet/transaction/resource_harness.rb index 081e3b10e..2a475a070 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 -- cgit