diff options
| author | Tim Smith <tsmith@chef.io> | 2019-02-05 18:41:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 18:41:40 -0800 |
| commit | f38a21b69b493291c3841954f0d7499c6d87476a (patch) | |
| tree | dc2e6bef7895a6f648e1658bb1b0154e71703428 | |
| parent | 88224f9a4c4b0d97d97d6a2e429591508681c31a (diff) | |
| parent | 81991027309748ed7ef3426e37e4669e38efba62 (diff) | |
| download | chef-f38a21b69b493291c3841954f0d7499c6d87476a.tar.gz | |
Merge pull request #8209 from chef/solo_14
chef-solo: Fixes for extra cookbook_path with parent dir that doesn't exist causes crash
| -rw-r--r-- | lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb index e07a73a118..5abd1c238b 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb @@ -110,7 +110,8 @@ class Chef else child_paths[name].each do |path| begin - Dir.mkdir(path, 0700) + ::FileUtils.mkdir_p(path) + ::FileUtils.chmod(0700, path) if Chef::Platform.windows? all_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_ALL administrators = Chef::ReservedNames::Win32::Security::SID.Administrators |