lib/chef/config.rb in microwave-0.1006.14 vs lib/chef/config.rb in microwave-0.1006.15

@@ -48,10 +48,10 @@
     # Turn on "path sanity" by default. See also: http://wiki.opscode.com/display/chef/User+Environment+PATH+Sanity
     enforce_path_sanity(true)
 
     # Where the cookbooks are located. Meaning is somewhat context dependent between
     # chef-client, and chef-solo.
-    cookbook_path [ "#{ENV['HOME']}/cookbooks" ] + $:.collect {|x| File.expand(x,'..','cookbooks'}
+    cookbook_path [ "#{ENV['HOME']}/cookbooks" ] + $:.collect {|x| File.join(File.expand_path("..", x), "cookbooks") }.select {|x| File.directory? x }
 
     # Where cookbook files are stored on the server (by content checksum)
     checksum_path "#{ENV['HOME']}/.microwave/checksums"
 
     # Where chef's cache files should be stored