summaryrefslogtreecommitdiff
path: root/lib/chef/run_context
diff options
context:
space:
mode:
authorMatthew Kent <mkent@magoazul.com>2013-04-11 13:56:29 -0700
committerBryan McLellan <btm@opscode.com>2013-06-18 10:26:28 -0700
commite0925fc0192ffa20e2bc0bef6ef0626d2ef75619 (patch)
treecefdfd56552f4ca90d5eaef37c8658e05565ab58 /lib/chef/run_context
parentcd2f13334f118aa0f48332ee99f9d42b02bf29d9 (diff)
downloadchef-e0925fc0192ffa20e2bc0bef6ef0626d2ef75619.tar.gz
[CHEF-3817] Fix dedupe in cookbook_order by returning dependencies as symbols.
And add matching spec.
Diffstat (limited to 'lib/chef/run_context')
-rw-r--r--lib/chef/run_context/cookbook_compiler.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/run_context/cookbook_compiler.rb b/lib/chef/run_context/cookbook_compiler.rb
index 9f5dc49922..d1b93f6652 100644
--- a/lib/chef/run_context/cookbook_compiler.rb
+++ b/lib/chef/run_context/cookbook_compiler.rb
@@ -259,11 +259,11 @@ class Chef
cookbook_collection[cookbook].segment_filenames(segment).sort
end
- # Yields the name of each cookbook depended on by +cookbook_name+ in
- # lexical sort order.
+ # Yields the name, as a symbol, of each cookbook depended on by
+ # +cookbook_name+ in lexical sort order.
def each_cookbook_dep(cookbook_name, &block)
cookbook = cookbook_collection[cookbook_name]
- cookbook.metadata.dependencies.keys.sort.each(&block)
+ cookbook.metadata.dependencies.keys.sort.map{|x| x.to_sym}.each(&block)
end
# Given a +recipe_name+, finds the file associated with the recipe.