diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-10 12:44:20 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-10 12:44:20 -0800 |
| commit | f3b397fe53450171b3e284d25533cceab9ef99ac (patch) | |
| tree | 2bc779f0674ba1a026cd689a370a06a50dcead8b | |
| parent | fcc18aa5062932ca52498328d410910d64bb0eb9 (diff) | |
| download | chef-f3b397fe53450171b3e284d25533cceab9ef99ac.tar.gz | |
fix windows path issues correctly
this really closes #1515 and #1751
| -rw-r--r-- | lib/chef/application/solo.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index c5d7549ffe..058910089f 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -219,7 +219,7 @@ class Chef::Application::Solo < Chef::Application Chef::Log.deprecation("-r MUST be changed to --recipe-url, the -r option will be changed in Chef 13.0") if ARGV.include?("-r") if Chef::Config[:recipe_url] - cookbooks_path = Array(Chef::Config[:cookbook_path]).detect{|e| e =~ /#{Chef::Config.platform_path_separator_escaped}cookbooks#{Chef::Config.platform_path_separator_escaped}*$/ } + cookbooks_path = Array(Chef::Config[:cookbook_path]).detect{|e| Pathname.cleanpath(e) =~ /\/cookbooks\/*$/ } recipes_path = File.expand_path(File.join(cookbooks_path, "..")) if Chef::Config[:delete_entire_chef_repo] |