From 4ebb8d0cb7c77719a25c689d05f6639f31829c0c Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 12 Dec 2007 13:50:07 -0600 Subject: Hopefully finally fixing #959. Loading the stored cache resulted in the resource duplication, based on how the settings are used, so I added a test to only use those settings if the directories do not exist. This isn't a great fix, but it will suffice until I can kill these resource conflicts once and for all. --- lib/puppet/util/storage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/util/storage.rb b/lib/puppet/util/storage.rb index 9e99057d9..9358a28e9 100644 --- a/lib/puppet/util/storage.rb +++ b/lib/puppet/util/storage.rb @@ -46,7 +46,7 @@ class Puppet::Util::Storage self.init def self.load - Puppet.settings.use(:main) + Puppet.settings.use(:main) unless FileTest.directory?(Puppet[:statedir]) unless File.exists?(Puppet[:statefile]) unless defined? @@state and ! @@state.nil? -- cgit