From a4f68969c04bc19b3382a9d068dee6721caec1c7 Mon Sep 17 00:00:00 2001
From: "John A. Barbuto" <jbarbuto@corp.sourceforge.com>
Date: Fri, 21 Aug 2009 20:18:32 -0700
Subject: Fixed #2562 - Recognize the usecacheonfailure option again
 Signed-off-by: John A. Barbuto <jbarbuto@corp.sourceforge.com>

---
 lib/puppet/configurer.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 81845f5cf..efda545c5 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -99,6 +99,11 @@ class Puppet::Configurer
         end
 
         unless result
+            if ! Puppet[:usecacheonfailure]
+                Puppet.warning "Not using cache on failed catalog"
+                return nil
+            end
+
             begin
                 duration = thinmark do
                     result = catalog_class.find(name, fact_options.merge(:ignore_terminus => true))
-- 
cgit