Fix yum update breakage - query should not change the name the user gave us; instead, the fully versioned pacakge name is now stored in the instance parameter

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2029 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index 7700bf0d6..7a2dfe53f 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -43,13 +43,10 @@ Puppet::Type.type(:package).provide :rpm do
         return packages
     end
 
+    # Find the fully versioned package name and the version alone. Returns
+    # a hash with entries :instance => fully versioned package name, and 
+    # :ensure => version-release
     def query
-        fields = {
-            :name => "NAME",
-            :version => "VERSION",
-            :description => "DESCRIPTION"
-        }
-
         cmd = ["-q", @model[:name], "--qf", "#{IDSTRING} #{VERSIONSTRING}\n"]
 
         begin
@@ -59,8 +56,7 @@ Puppet::Type.type(:package).provide :rpm do
         end
 
         regex = %r{^(\S+)\s+(\S+)}
-        #fields = [:name, :ensure, :description]
-        fields = [:name, :ensure]
+        fields = [:instance, :ensure]
         hash = {}
         if match = regex.match(output)
             fields.zip(match.captures) { |field,value|
@@ -107,12 +103,16 @@ Puppet::Type.type(:package).provide :rpm do
     end
 
     def uninstall
-        rpm "-e", @model[:name]
+        rpm "-e", @model[:instance]
     end
 
     def update
         self.install
     end
+
+    def versionable?
+        true
+    end
 end
 
 # $Id$