diff options
| author | Steven Danna <steve@chef.io> | 2015-10-23 12:35:31 +0100 |
|---|---|---|
| committer | Steven Danna <steve@chef.io> | 2015-10-23 12:35:31 +0100 |
| commit | 2dc3f5654df53a15cf503cbefd051f3387133041 (patch) | |
| tree | 6a4c8fb64a9fcaae2810c5f1d45298deb61756c6 | |
| parent | e98d4dafc8121e1adeff580bf5dc15c971e3618f (diff) | |
| parent | b036d1542c10a6a4c0910b96a27404735134055a (diff) | |
| download | chef-2dc3f5654df53a15cf503cbefd051f3387133041.tar.gz | |
Merge pull request #4091 from chef/ssd/download-root-files
Allow downloading of root_files in a chef repository
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/file_system_entry.rb | 2 | ||||
| -rw-r--r-- | spec/integration/knife/download_spec.rb | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 024b016350..6bc03bae48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ * [pr#4034](https://github.com/chef/chef/pull/4034) add optional ruby-profiling with --profile-ruby * [pr#3119](https://github.com/chef/chef/pull/3119) allow removing user, even if their GID isn't resolvable -* [pr#4068](https://github.com/chef/chef/pull/4068) update messaging from LWRP to Custom Resource in logging and spec -* [pr#4021](https://github.com/chef/chef/pull/4021) add missing requires for Chef::DSL::Recipe to LWRPBase +* [pr#4068](https://github.com/chef/chef/pull/4068) update messaging from LWRP to Custom Resource in logging and spec +* [pr#4021](https://github.com/chef/chef/pull/4021) add missing requires for Chef::DSL::Recipe to LWRPBase * [pr#3597](https://github.com/chef/chef/pull/3597) print STDOUT from the powershell_script +* [pr#4091](https://github.com/chef/chef/pull/4091) Allow downloading of root_files in a chef repository ## 12.5.1 diff --git a/lib/chef/chef_fs/file_system/file_system_entry.rb b/lib/chef/chef_fs/file_system/file_system_entry.rb index 8611aa2e0f..478631eac2 100644 --- a/lib/chef/chef_fs/file_system/file_system_entry.rb +++ b/lib/chef/chef_fs/file_system/file_system_entry.rb @@ -83,7 +83,7 @@ class Chef end def exists? - File.exists?(file_path) && parent.can_have_child?(name, dir?) + File.exists?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?)) end def read diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb index 8842ed5ac4..b8a19061b7 100644 --- a/spec/integration/knife/download_spec.rb +++ b/spec/integration/knife/download_spec.rb @@ -1103,6 +1103,15 @@ EOM before :each do Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo') end + when_the_repository 'has existing top level files' do + before do + file 'invitations.json', {} + end + + it "can still download top level files" do + knife('download /invitations.json').should_succeed + end + end when_the_repository 'is empty' do it 'knife download / downloads everything' do |