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

Author: adamhjk

chef/lib/chef/provider/package/yum.rb

@@ -140,10 +140,11 @@ def install_package(name, version)
 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

chef/spec/unit/provider/package/yum_spec.rb

@@ -142,9 +142,16 @@
 @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