summaryrefslogtreecommitdiff
path: root/lib/chef/chef_fs/data_handler
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2013-05-19 12:39:47 -0700
committerJohn Keiser <jkeiser@opscode.com>2013-06-07 13:12:33 -0700
commit41a963cd233e92c9c8162c44e9f4d9f7c596584d (patch)
tree5b9ec1144aabc32e6ceb3e1b98d8844282fe419e /lib/chef/chef_fs/data_handler
parent42ac9b1567bee7ed4946fd3ca397047eb8d10536 (diff)
downloadchef-41a963cd233e92c9c8162c44e9f4d9f7c596584d.tar.gz
Fix container verification to use containername instead of name
Diffstat (limited to 'lib/chef/chef_fs/data_handler')
-rw-r--r--lib/chef/chef_fs/data_handler/container_data_handler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/data_handler/container_data_handler.rb b/lib/chef/chef_fs/data_handler/container_data_handler.rb
index 21359b6bf6..714f83824a 100644
--- a/lib/chef/chef_fs/data_handler/container_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/container_data_handler.rb
@@ -17,7 +17,7 @@ class Chef
def verify_integrity(object, entry, &on_error)
base_name = remove_dot_json(entry.name)
- if object['name'] != "data_bag_item_#{entry.parent.name}_#{remove_dot_json(entry.name)}"
+ if object['containername'] != base_name
on_error.call("Name in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['name']}')")
end
end