summaryrefslogtreecommitdiff
path: root/lib/chef/cookbook/syntax_check.rb
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2014-09-29 21:23:41 -0700
committerJay Mundrawala <jdmundrawala@gmail.com>2014-09-29 21:23:41 -0700
commita944d11c108a2bfb91f4b7756030a3e98abec9eb (patch)
tree8d13902a8891a90dab57322e8a6e3145c3bf04c1 /lib/chef/cookbook/syntax_check.rb
parentcdfa54599e4fcd98afd640f6b757518320210259 (diff)
downloadchef-jdmundrawala/cookbook-loading.tar.gz
Syntax checker uses helper method for relative pathjdmundrawala/cookbook-loading
Test pass on windows
Diffstat (limited to 'lib/chef/cookbook/syntax_check.rb')
-rw-r--r--lib/chef/cookbook/syntax_check.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/chef/cookbook/syntax_check.rb b/lib/chef/cookbook/syntax_check.rb
index 69c194516b..1437785259 100644
--- a/lib/chef/cookbook/syntax_check.rb
+++ b/lib/chef/cookbook/syntax_check.rb
@@ -103,9 +103,7 @@ class Chef
def remove_ignored_files(file_list)
return file_list unless chefignore.ignores.length > 0
file_list.reject do |full_path|
- cookbook_pn = Pathname.new cookbook_path
- full_pn = Pathname.new full_path
- relative_pn = full_pn.relative_path_from cookbook_pn
+ relative_pn = Chef::Util::PathHelper.relative_path_from(cookbook_path, full_path)
chefignore.ignored? relative_pn.to_s
end
end