summaryrefslogtreecommitdiff
path: root/lib/chef/run_context
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2018-05-16 15:29:08 +0100
committerThom May <thom@chef.io>2018-05-16 15:29:08 +0100
commit098ebb3c7ad9fa5ebbfdb7288241baccb9dae039 (patch)
treee965777325d24496e03045fd33d8f2dd4d8ec9ff /lib/chef/run_context
parent3a6e55ba3226f41181c53a6725544af42d4525c4 (diff)
downloadchef-098ebb3c7ad9fa5ebbfdb7288241baccb9dae039.tar.gz
Fix manifest entries for root filestm/fix_manifest_root_files
We weren't consistently naming root files; in some places in the spec the names contained the `root_files` segment and in other places they didn't. This now always uses `root_files`. Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'lib/chef/run_context')
-rw-r--r--lib/chef/run_context/cookbook_compiler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/run_context/cookbook_compiler.rb b/lib/chef/run_context/cookbook_compiler.rb
index 25d32ea7e2..4edf175824 100644
--- a/lib/chef/run_context/cookbook_compiler.rb
+++ b/lib/chef/run_context/cookbook_compiler.rb
@@ -191,7 +191,7 @@ class Chef
def load_attributes_from_cookbook(cookbook_name)
list_of_attr_files = files_in_cookbook_by_segment(cookbook_name, :attributes).dup
- root_alias = cookbook_collection[cookbook_name].files_for(:root_files).find { |record| record[:name] == "attributes.rb" }
+ root_alias = cookbook_collection[cookbook_name].files_for(:root_files).find { |record| record[:name] == "root_files/attributes.rb" }
default_file = list_of_attr_files.find { |path| File.basename(path) == "default.rb" }
if root_alias
if default_file