diff options
Diffstat (limited to 'lib/chef/cookbook_version.rb')
| -rw-r--r-- | lib/chef/cookbook_version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb index 6e4f13c291..8a616e5e07 100644 --- a/lib/chef/cookbook_version.rb +++ b/lib/chef/cookbook_version.rb @@ -598,7 +598,7 @@ class Chef filename = record[:name] base_dup_name = File.join(File.dirname(filename), File.basename(filename, File.extname(filename))) yml_files.each do |other| - if other[:name] =~ /#{(File.extname(filename) == ".yml") ? "#{base_dup_name}.yaml" : "#{base_dup_name}.yml"}$/ + if /#{(File.extname(filename) == ".yml") ? "#{base_dup_name}.yaml" : "#{base_dup_name}.yml"}$/.match?(other[:name]) raise Chef::Exceptions::AmbiguousYAMLFile.new("Cookbook #{name}@#{version} contains ambiguous files: #{filename} and #{other[:name]}. Please update the cookbook to remove the incorrect file.") end end |