From a8d9976d0a11c4dc50b2ef49c63f3f745cb4eccb Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Fri, 14 Nov 2008 19:15:37 -0600 Subject: Catalogs always consider resource data to be expired if not mid-transaction. This way we'll cache when in a transaction, but otherwise always hit the disk so the data is fresh. This works because we really only use resources mid-transaction, but it behaves correctly if we happen to use a resource outside of a transaction. Signed-off-by: Luke Kanies --- lib/puppet/node/catalog.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/puppet') diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index a438a4764..e82e63444 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -183,6 +183,14 @@ class Puppet::Node::Catalog < Puppet::SimpleGraph resource end + def expired?(ts) + if applying? + return super + else + return true + end + end + # Make sure we support the requested extraction format. def extraction_format=(value) unless respond_to?("extract_to_%s" % value) -- cgit