summaryrefslogtreecommitdiff
path: root/lib/chef/cookbook
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2016-05-10 17:09:57 +0100
committerThom May <thom@chef.io>2016-05-16 13:38:12 +0100
commit09ae18ee32b61e1b3c607dcc84c9d59d2c300428 (patch)
tree0add1084ac4642c5119dff102000075bf6d58321 /lib/chef/cookbook
parent9bd561b2fafe03444d690bef0b882a446b327cd6 (diff)
downloadchef-09ae18ee32b61e1b3c607dcc84c9d59d2c300428.tar.gz
Ensure that solo specific code is run at the proper time
ie, only when we're in OG mode and not in local mode. Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'lib/chef/cookbook')
-rw-r--r--lib/chef/cookbook/synchronizer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/cookbook/synchronizer.rb b/lib/chef/cookbook/synchronizer.rb
index ec388746e9..1ee30bacc7 100644
--- a/lib/chef/cookbook/synchronizer.rb
+++ b/lib/chef/cookbook/synchronizer.rb
@@ -43,7 +43,7 @@ class Chef
end
def cleanup_file_cache
- unless Chef::Config[:solo] || skip_removal
+ unless Chef::Config[:solo_legacy_mode] || skip_removal
# Delete each file in the cache that we didn't encounter in the
# manifest.
cache.find(File.join(%w{cookbooks ** {*,.*}})).each do |cache_filename|