CHEF-988: Make yum only do updates if it don't got a version

Thom May · Thom May · commit 7259a992e8ce · 2010-02-26T17:00:42.000Z
diff --git a/chef/lib/chef/provider/package/yum.rb b/chef/lib/chef/provider/package/yum.rb
@@ -140,10 +140,11 @@ def install_package(name, version)
 end
 
 def upgrade_package(name, version)
- # If we have a version, we can upgrade - otherwise, install
- if @current_resource.version
+ # If we're not given a version, running update is the correct
+ # option. If we are, then running install_package is right.
+ unless version
 run_command_with_systems_locale(
- :command => "yum -d0 -e0 -y update #{name}-#{version}"
+ :command => "yum -d0 -e0 -y update #{name}"
 ) 
 @yum.flush
 else

-Original file line number
+Diff line change
 end
 defupgrade_package(name,version)
 -# If we have a version, we can upgrade - otherwise, install
 -if@current_resource.version
 +# If we're not given a version, running update is the correct
 +# option. If we are, then running install_package is right.
 +unlessversion
 run_command_with_systems_locale(
 -:command=>"yum -d0 -e0 -y update #{name}-#{version}"
 +:command=>"yum -d0 -e0 -y update #{name}"
+)
 @yum.flush
 else