summaryrefslogtreecommitdiff
path: root/lib/chef/cookbook
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2017-02-01 17:32:02 +0000
committerGitHub <noreply@github.com>2017-02-01 17:32:02 +0000
commit71629035eee1905a7324e0c2e6ba4bc3cecd2926 (patch)
tree6292502d40d55048c623e5fef05691499a64ade5 /lib/chef/cookbook
parent757b84b0fbb2e835414919a22b5c98c7590ea085 (diff)
parentf8e19c924cef965e62eeb0d8ffee39aecc9f26af (diff)
downloadchef-71629035eee1905a7324e0c2e6ba4bc3cecd2926.tar.gz
Merge pull request #5704 from ceneo/knife-upload-too-short-control-escape
Core: Ensure paths are correctly escaped when syntax checking
Diffstat (limited to 'lib/chef/cookbook')
-rw-r--r--lib/chef/cookbook/syntax_check.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/cookbook/syntax_check.rb b/lib/chef/cookbook/syntax_check.rb
index f8559433dc..8d0d636bd2 100644
--- a/lib/chef/cookbook/syntax_check.rb
+++ b/lib/chef/cookbook/syntax_check.rb
@@ -110,7 +110,7 @@ class Chef
end
def remove_uninteresting_ruby_files(file_list)
- file_list.reject { |f| f =~ %r{#{cookbook_path}/(files|templates)/} }
+ file_list.reject { |f| f =~ %r{#{Regexp.quote(cookbook_path)}/(files|templates)/} }
end
def ruby_files