diff options
author | John A. Barbuto <jbarbuto@corp.sourceforge.com> | 2009-08-21 20:18:32 -0700 |
---|---|---|
committer | John A. Barbuto <jbarbuto@corp.sourceforge.com> | 2009-08-21 20:18:32 -0700 |
commit | a4f68969c04bc19b3382a9d068dee6721caec1c7 (patch) | |
tree | 79f5c87fa32d5547491e6b2db233e779f0e19854 /lib | |
parent | e408d6c7d562f126df97cd57e04fd7802bc53390 (diff) | |
download | puppet-a4f68969c04bc19b3382a9d068dee6721caec1c7.tar.gz puppet-a4f68969c04bc19b3382a9d068dee6721caec1c7.tar.xz puppet-a4f68969c04bc19b3382a9d068dee6721caec1c7.zip |
Fixed #2562 - Recognize the usecacheonfailure option again
Signed-off-by: John A. Barbuto <jbarbuto@corp.sourceforge.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/configurer.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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)) |