From 98c3ffd8a647b5cd5d11c73e2180638650d1f48d Mon Sep 17 00:00:00 2001 From: Christopher Brown Date: Thu, 13 May 2010 15:53:30 -0700 Subject: backport fix for part of CHEF-550, PL-343 roles-in-roles & 500 error --- chef/lib/chef/run_list.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef/lib/chef/run_list.rb b/chef/lib/chef/run_list.rb index 22d6b56dd9..c15ad24286 100644 --- a/chef/lib/chef/run_list.rb +++ b/chef/lib/chef/run_list.rb @@ -142,7 +142,7 @@ class Chef role = Chef::Role.cdb_load(name, couchdb) end @seen_roles << name - rec, d, o = role.run_list.expand(from) + rec, d, o = role.run_list.expand(from,couchdb) rec.each { |r| recipes << r unless recipes.include?(r) } default_attrs = Chef::Mixin::DeepMerge.merge(default_attrs, Chef::Mixin::DeepMerge.merge(role.default_attributes,d)) override_attrs = Chef::Mixin::DeepMerge.merge(override_attrs, Chef::Mixin::DeepMerge.merge(role.override_attributes, o)) -- cgit v1.2.1