backport fix for part of CHEF-550, PL-343 roles-in-roles & 500 error

Christopher Brown · Christopher Brown · commit 98c3ffd8a647 · 2010-05-13T15:53:30.000-07:00
diff --git a/chef/lib/chef/run_list.rb b/chef/lib/chef/run_list.rb
@@ -142,7 +142,7 @@ def expand(from='server', couchdb=nil)
 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))

-Original file line number
+Diff line change
 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 << runlessrecipes.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))