Permalink
Browse files

fix regression picked up by travis

  • Loading branch information...
dpetzel committed Oct 25, 2015
1 parent 6019e24 commit a99a19eaa277d4ebe232cec5bcf37f02a71db404
Showing with 4 additions and 5 deletions.
  1. +1 −1 Berksfile.lock
  2. +3 −4 libraries/test_loader.rb
View
@@ -10,7 +10,7 @@ DEPENDENCIES
GRAPH
chef_handler (1.1.6)
minitest-handler (1.4.1)
minitest-handler (1.5.0)
chef_handler (>= 0.0.0)
minitest-handler_test1 (0.0.1)
chef_handler (>= 0.0.0)
View
@@ -255,10 +255,9 @@ def cookbook_file_names(cookbook_name)
# when the cookbook_file resource goes to place the file
relative_file_name = cb_file.dup
Array(Chef::Config[:cookbook_path]).each do |cb_path|
this_cb_path = ::File.absolute_path(
# Ensure we have the trailing slash
::File.join(cb_path, cookbook_name, '/')
)
this_cb_path = ::File.absolute_path("#{cb_path}/#{cookbook_name}")
# Ensure we have the trailing slash. absolute path will strip it
this_cb_path += '/'
# Ensure the full cookbook path is not part of relative name
dir_prefix = /[A-Za-z]?:?#{this_cb_path}/
relative_file_name.gsub!(dir_prefix, '')

0 comments on commit a99a19e

Please sign in to comment.