diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-12 17:06:23 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-12 17:06:23 -0600 |
| commit | cd4af087d087b3a78cd37cfaa31ea5ca35ed96c9 (patch) | |
| tree | a4a1d6402ddb41bf8efc4a7a6ef4931fec001f7f | |
| parent | e0f5444021fd4210cb15865e547351c7783e1471 (diff) | |
| parent | 4ebb8d0cb7c77719a25c689d05f6639f31829c0c (diff) | |
| download | puppet-cd4af087d087b3a78cd37cfaa31ea5ca35ed96c9.tar.gz puppet-cd4af087d087b3a78cd37cfaa31ea5ca35ed96c9.tar.xz puppet-cd4af087d087b3a78cd37cfaa31ea5ca35ed96c9.zip | |
Merge branch 'master' of ssh://reductivelabs.com/opt/rl/git/puppet
| -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? |