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/platform.rb | |
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/platform.rb')
-rw-r--r-- | lib/chef/platform.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/platform.rb b/lib/chef/platform.rb index bca003d35a..210aabd3e5 100644 --- a/lib/chef/platform.rb +++ b/lib/chef/platform.rb @@ -19,7 +19,7 @@ require 'chef/config' require 'chef/log' require 'chef/mixin/params_validate' -require 'chef/version_constraint' +require 'chef/version_constraint/platform' # This file depends on nearly every provider in chef, but requiring them # directly causes circular requires resulting in uninitialized constant errors. @@ -345,12 +345,12 @@ class Chef end platform_versions.each do |platform_version, provider| begin - version_constraint = Chef::VersionConstraint::Cookbook.new(platform_version) + version_constraint = Chef::VersionConstraint::Platform.new(platform_version) if version_constraint.include?(version) Chef::Log.debug("Platform #{name.to_s} version #{version} found") provider_map.merge!(provider) end - rescue Chef::Exceptions::InvalidCookbookVersion + rescue Chef::Exceptions::InvalidPlatformVersion Chef::Log.debug("Chef::Version::Comparable does not know how to parse the platform version: #{version}") end end |