diff options
| author | Thom May <thom@may.lt> | 2016-07-05 17:49:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 17:49:00 +0100 |
| commit | 6a9d42a4a701d9b168acf3469b7e613bee1c853e (patch) | |
| tree | 58b712fc697151ea98a86fc9796645d03993e9be | |
| parent | f5cae5ea1b156515af1e38df53df35ce606404db (diff) | |
| parent | a35818d68df51e768a5717f3b451853248d28797 (diff) | |
| download | chef-6a9d42a4a701d9b168acf3469b7e613bee1c853e.tar.gz | |
Merge pull request #5079 from Tensibai/Fix_#5078_local_mode_repo_path
Fix #5078 using cwd parameter instead of Dir.pwd
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 094c8641a3..a194edc80e 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -132,8 +132,8 @@ module ChefConfig until File.directory?(PathHelper.join(path, "cookbooks")) || File.directory?(PathHelper.join(path, "cookbook_artifacts")) new_path = File.expand_path("..", path) if new_path == path - ChefConfig.logger.warn("No cookbooks directory found at or above current directory. Assuming #{Dir.pwd}.") - return Dir.pwd + ChefConfig.logger.warn("No cookbooks directory found at or above current directory. Assuming #{cwd}.") + return cwd end path = new_path end |