diff options
| author | Tim Hinderliter <tim@opscode.com> | 2011-03-21 17:58:25 -0700 |
|---|---|---|
| committer | Tim Hinderliter <tim@opscode.com> | 2011-03-21 17:58:59 -0700 |
| commit | deb04caba7d520bb3931a838848530b872e86aa0 (patch) | |
| tree | 2951c50fbe1e0e6d16f17c11687fe8d4a457afd7 /chef/lib/chef/cookbook_version_selector.rb | |
| parent | cf5a89ca4cd487dd6f3aafe9d01a165d65fb1db4 (diff) | |
| download | chef-deb04caba7d520bb3931a838848530b872e86aa0.tar.gz | |
Work on cookbook versioing in support of the platform
Rework of cookbook_sync_api features expectations to peer into the exception
body instead of hooking into Chef::Log output
Diffstat (limited to 'chef/lib/chef/cookbook_version_selector.rb')
| -rw-r--r-- | chef/lib/chef/cookbook_version_selector.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chef/lib/chef/cookbook_version_selector.rb b/chef/lib/chef/cookbook_version_selector.rb index 1fd3e65815..d7792d59a1 100644 --- a/chef/lib/chef/cookbook_version_selector.rb +++ b/chef/lib/chef/cookbook_version_selector.rb @@ -149,11 +149,11 @@ class Chef # # Returns: # Hash of: name to CookbookVersion - def self.expand_to_cookbook_versions(run_list, environment) + def self.expand_to_cookbook_versions(run_list, environment, couchdb=nil) # expand any roles in this run_list. - expanded_run_list = run_list.expand(environment, 'couchdb').recipes.with_version_constraints + expanded_run_list = run_list.expand(environment, 'couchdb', :couchdb => couchdb).recipes.with_version_constraints - cookbooks_for_environment = Chef::Environment.cdb_load_filtered_cookbook_versions(environment) + cookbooks_for_environment = Chef::Environment.cdb_load_filtered_cookbook_versions(environment, couchdb) constrain(cookbooks_for_environment, expanded_run_list) end end |