Skip to content

Commit

Permalink
fix windows path issues correctly
Browse files Browse the repository at this point in the history
this really closes #1515 and #1751
  • Loading branch information
lamont-granquist committed Feb 10, 2016
1 parent fcc18aa commit f3b397f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/chef/application/solo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def reconfigure
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]
Expand Down

0 comments on commit f3b397f

Please sign in to comment.