diff options
| author | Christopher Brown <cb@opscode.com> | 2010-05-13 15:53:30 -0700 |
|---|---|---|
| committer | Christopher Brown <cb@opscode.com> | 2010-05-13 15:53:30 -0700 |
| commit | 98c3ffd8a647b5cd5d11c73e2180638650d1f48d (patch) | |
| tree | 78761a53daec9a4df08e835c6c86ee157bd28ac1 | |
| parent | b165dedf145c2c27168f8cdc87bdd61336c6a02a (diff) | |
| download | chef-alpha_deploy_2_fix.tar.gz | |
backport fix for part of CHEF-550, PL-343 roles-in-roles & 500 erroralpha_deploy_2_fix
| -rw-r--r-- | chef/lib/chef/run_list.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |