diff options
| author | Matthew Kent <mkent@magoazul.com> | 2011-05-10 22:30:40 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2011-05-19 18:05:38 -0700 |
| commit | 2a40cc1b59fa2985a2442c8177b08598261f7380 (patch) | |
| tree | f5dd55536a54c9a8bb72b5fafd74c420178dbf36 | |
| parent | d925ff19637d4b4d1254da268fb82de5e2a98762 (diff) | |
| download | chef-2a40cc1b59fa2985a2442c8177b08598261f7380.tar.gz | |
Some cleanup and commenting.
Don't need to worry about specific versions for upgrades.
| -rw-r--r-- | chef/lib/chef/provider/package/yum.rb | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/chef/lib/chef/provider/package/yum.rb b/chef/lib/chef/provider/package/yum.rb index cedea0297c..40463618bf 100644 --- a/chef/lib/chef/provider/package/yum.rb +++ b/chef/lib/chef/provider/package/yum.rb @@ -608,6 +608,9 @@ class Chef @yum = YumCache.instance end + # Extra attributes + # + def arch if @new_resource.respond_to?("arch") @new_resource.arch @@ -624,10 +627,15 @@ class Chef end end + # Helpers + # + def yum_arch arch ? ".#{arch}" : nil end + # Standard Provider methods for Parent + def load_current_resource if flush_cache[:before] @yum.reload @@ -636,7 +644,7 @@ class Chef # Allow for foo.x86_64 style package_name like yum uses in it's output # # Don't overwrite an existing arch - if @new_resource.respond_to?("arch") and @new_resource.arch.nil? + unless arch if @new_resource.package_name =~ %r{^(.*)\.(.*)$} new_package_name = $1 new_arch = $2 @@ -730,18 +738,18 @@ class Chef end end - # Keep upgrades from trying to install an older candidate version + # Keep upgrades from trying to install an older candidate version. Can happen when a new + # version is installed then removed from a repository, now the older available version + # shows up as a viable install candidate. + # # Can be done in upgrade_package but an upgraded from->to log message slips out # # Hacky - better overall solution? Custom compare in Package provider? def action_upgrade - # Don't restrict the attempts of someone passing a version - if @new_resource.version.nil? == false - super - # If there's no custom version ensure the candidate is newer - elsif RPMUtils.rpmvercmp(candidate_version, @current_resource.version) == 1 # > + # Ensure the candidate is newer + if RPMUtils.rpmvercmp(candidate_version, @current_resource.version) == 1 # > super - # No specific version passed and candidate is older + # Candidate is older else Chef::Log.debug("#{@new_resource} is at the latest version - nothing to do") end |