diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-18 21:15:23 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-18 21:15:23 +0000 |
| commit | 9946249255a69431349185807f4291745b15ca7f (patch) | |
| tree | 60431c90c993bce8869818b00c488e191b928d4c /lib | |
| parent | b6d0d27a86cfc8aab5b2b4d5239d005f78f14029 (diff) | |
| download | puppet-9946249255a69431349185807f4291745b15ca7f.tar.gz puppet-9946249255a69431349185807f4291745b15ca7f.tar.xz puppet-9946249255a69431349185807f4291745b15ca7f.zip | |
Only caching the configuration when it has been successfully turned into Puppet objects
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2392 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index 2dc71b45e..c96b0c278 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -616,10 +616,6 @@ class Puppet::Network::Client::Master < Puppet::Network::Client Puppet::Util::Storage.cache(:configuration)[:compile_time] = @compile_time end - if @cache and ! fromcache - self.cache(textobjects) - end - begin objects = YAML.load(textobjects) rescue => detail @@ -627,6 +623,10 @@ class Puppet::Network::Client::Master < Puppet::Network::Client "Could not understand configuration: %s" % detail.to_s end + + if @cache and ! fromcache + self.cache(textobjects) + end return objects end |