summaryrefslogtreecommitdiff
path: root/lib/chef/node.rb
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2015-09-29 14:46:28 -0700
committerThom May <thom@chef.io>2015-09-29 15:13:09 -0700
commit53380ccb30465f003ddc2fb3461007c135110577 (patch)
treef435d2da42949bcbfbaf2c586faf76b22e0f4166 /lib/chef/node.rb
parentbc82c3e8603f6908d80fc29beb1d0902563398e7 (diff)
downloadchef-53380ccb30465f003ddc2fb3461007c135110577.tar.gz
Ensure that our list of recipes is backwards compattm/duplicate_recipes
Prior to chef 12.2 we included unexpanded 'cookbook' names for default recipes. In 12.2, we moved to expanded ('cookbook::default') names, which broke some searches. However, some of our users have now moved to searching for expanded, so we need to cater for both. Fixes #3767
Diffstat (limited to 'lib/chef/node.rb')
-rw-r--r--lib/chef/node.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index 668ddbdc35..1e4a850277 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -440,7 +440,7 @@ class Chef
self.tags # make sure they're defined
- automatic_attrs[:recipes] = expansion.recipes.with_fully_qualified_names_and_version_constraints
+ automatic_attrs[:recipes] = expansion.recipes.with_duplicate_names
automatic_attrs[:expanded_run_list] = expansion.recipes.with_fully_qualified_names_and_version_constraints
automatic_attrs[:roles] = expansion.roles