diff options
author | Xabier de Zuazo <xabier@onddo.com> | 2013-03-13 12:03:35 +0100 |
---|---|---|
committer | Bryan McLellan <btm@opscode.com> | 2013-04-11 13:04:33 -0700 |
commit | 7052e7712a6b159626c2077f86e8be551e79bbd4 (patch) | |
tree | ef0cb7faba3afcce049d2f8a34076344811625c6 /lib/chef/run_list | |
parent | f554a1c0fbc1f308462d3d62544a0fd7ed7df6ec (diff) | |
download | chef-7052e7712a6b159626c2077f86e8be551e79bbd4.tar.gz |
[CHEF-3919] Removed Chef::Version::Cookbook code and replaced by a Chef::Version::Platform class, reverting Chef::Version class changes
Diffstat (limited to 'lib/chef/run_list')
-rw-r--r-- | lib/chef/run_list/versioned_recipe_list.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/run_list/versioned_recipe_list.rb b/lib/chef/run_list/versioned_recipe_list.rb index 9339985207..0eefded964 100644 --- a/lib/chef/run_list/versioned_recipe_list.rb +++ b/lib/chef/run_list/versioned_recipe_list.rb @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -require 'chef/version/cookbook' +require 'chef/version_class' require 'chef/version_constraint' # Why does this class exist? @@ -31,7 +31,7 @@ class Chef def add_recipe(name, version=nil) if version && @versions.has_key?(name) - unless Chef::Version::Cookbook.new(@versions[name]) == Chef::Version::Cookbook.new(version) + unless Chef::Version.new(@versions[name]) == Chef::Version.new(version) raise Chef::Exceptions::CookbookVersionConflict, "Run list requires #{name} at versions #{@versions[name]} and #{version}" end end @@ -44,10 +44,10 @@ class Chef end # Return an Array of Hashes, each of the form: - # {:name => RECIPE_NAME, :version_constraint => Chef::VersionConstraint::Cookbook } + # {:name => RECIPE_NAME, :version_constraint => Chef::VersionConstraint } def with_version_constraints self.map do |recipe_name| - constraint = Chef::VersionConstraint::Cookbook.new(@versions[recipe_name]) + constraint = Chef::VersionConstraint.new(@versions[recipe_name]) { :name => recipe_name, :version_constraint => constraint } end end |