Merge branch 'CHEF-988' of git://github.com/thommay/chef into thommay/CHEF-988

2 files changed, 13 insertions, 5 deletions

diff --git a/chef/lib/chef/provider/package/yum.rb b/chef/lib/chef/provider/package/yum.rb
index eb7ed422dd..df238204e5 100644
--- a/chef/lib/chef/provider/package/yum.rb
+++ b/chef/lib/chef/provider/package/yum.rb
@@ -140,10 +140,11 @@ class Chef
         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
diff --git a/chef/spec/unit/provider/package/yum_spec.rb b/chef/spec/unit/provider/package/yum_spec.rb
index 37e52639be..fab5d3baa1 100644
--- a/chef/spec/unit/provider/package/yum_spec.rb
+++ b/chef/spec/unit/provider/package/yum_spec.rb
@@ -142,9 +142,16 @@ describe Chef::Provider::Package::Yum, "upgrade_package" do
     @provider.current_resource = @current_resource
   end
   
-  it "should run yum update if the package is installed" do
+  it "should run yum update if the package is installed and no version is given" do
     @provider.should_receive(:run_command_with_systems_locale).with({
-      :command => "yum -d0 -e0 -y update emacs-11"
+      :command => "yum -d0 -e0 -y update emacs"
+    })
+    @provider.upgrade_package(@new_resource.name, nil)
+  end
+  
+  it "should run yum install if the package is installed and a version is given" do
+    @provider.should_receive(:run_command_with_systems_locale).with({
+      :command => "yum -d0 -e0 -y install emacs-11"
     })
     @provider.upgrade_package(@new_resource.name, @provider.candidate_version)
   end