diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-12 13:50:07 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-12 13:50:07 -0600 |
| commit | 4ebb8d0cb7c77719a25c689d05f6639f31829c0c (patch) | |
| tree | 897ec646bb355a553054d1eab45101c5b19acd65 | |
| parent | 690e2872864a8a46710445ab07c7d9afa33d0afc (diff) | |
| download | puppet-4ebb8d0cb7c77719a25c689d05f6639f31829c0c.tar.gz puppet-4ebb8d0cb7c77719a25c689d05f6639f31829c0c.tar.xz puppet-4ebb8d0cb7c77719a25c689d05f6639f31829c0c.zip | |
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.
| -rw-r--r-- | lib/puppet/util/storage.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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? |