diff options
author | John Keiser <jkeiser@opscode.com> | 2014-04-22 12:39:48 -0700 |
---|---|---|
committer | John Keiser <jkeiser@opscode.com> | 2014-04-22 12:39:48 -0700 |
commit | 3d6fa1ed64e4c6eff7053a33b4f8e5b728ce2959 (patch) | |
tree | 6a338b0004819634c3b797f5155dea204128bb18 /lib/chef/chef_fs/chef_fs_data_store.rb | |
parent | 5a7b4a30fb75c58b7944b4a5612883e5470539de (diff) | |
download | chef-3d6fa1ed64e4c6eff7053a33b4f8e5b728ce2959.tar.gz |
Don't consider .uploaded-cookbook-version.json uploadable
since it won't be uploaded
Diffstat (limited to 'lib/chef/chef_fs/chef_fs_data_store.rb')
-rw-r--r-- | lib/chef/chef_fs/chef_fs_data_store.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/chef_fs/chef_fs_data_store.rb b/lib/chef/chef_fs/chef_fs_data_store.rb index 7f5abaf013..566ca9f9a2 100644 --- a/lib/chef/chef_fs/chef_fs_data_store.rb +++ b/lib/chef/chef_fs/chef_fs_data_store.rb @@ -279,11 +279,13 @@ class Chef end end - cookbook_fs.add_file("#{cookbook_path}/.uploaded-cookbook-version.json", data) - # Use the copy/diff algorithm to copy it down so we don't destroy # chefignored data. This is terribly un-thread-safe. Chef::ChefFS::FileSystem.copy_to(Chef::ChefFS::FilePattern.new("/#{cookbook_path}"), cookbook_fs, chef_fs, nil, {:purge => true}) + + # Create the .uploaded-cookbook-version.json + cookbook_entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, cookbook_path) + cookbook_entry.write_uploaded_cookbook_version(data) end def split_name_version(entry_name) |