Attachment 317948 Details for Bug 464472 – Add support for RPM provides

Add support for RPM provides

puppet-0.24.4-rpmprovides.patch (text/plain), 2.17 KB, created by Lubomir Rintel on 2008-09-29 10:43:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Rintel

Created: 2008-09-29 10:43:04 UTC

Size: 2.17 KB

patch

obsolete

>Fix support of package provides. All package management systems (apt-rpm,
>yum, up2date) would grab the package, without puppet noticing it.
>
>This adds package objects both versioned and unversioned provides of
>a package.
>
>Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com>
>
>--- puppet-0.24.4/lib/puppet/provider/package/rpm.rb.rpmprovides	2008-09-29 12:35:33.000000000 +0200
>+++ puppet-0.24.4/lib/puppet/provider/package/rpm.rb	2008-09-29 12:36:36.000000000 +0200
>@@ -25,11 +25,26 @@
> 
>         # list out all of the packages
>         begin
>-            execpipe("#{command(:rpm)} -qa --nosignature --nodigest --qf '#{NEVRAFORMAT}\n'") { |process|
>+            execpipe("#{command(:rpm)} -qa --nosignature --nodigest --provides --qf '-pkg #{NEVRAFORMAT}\n'") { |process|
>                 # now turn each returned line into a package object
>                 process.each { |line|
>-                    hash = nevra_to_hash(line)
>-                    packages << new(hash)
>+                    if line =~ /^-pkg (.*)/
>+                        # A package
>+                        pkghash = nevra_to_hash($1)
>+                        packages << new(pkghash)
>+                    else
>+                        # A package provide
>+                        providehash = pkghash;
>+                        line.chomp!
>+                        if line =~ /(.*) = (.*)/
>+                            providehash[:name] = $1;
>+                            providehash[:version] = $2;
>+                        else
>+                            providehash[:name] = line;
>+                        end
>+                        providehash[:ensure] = "#{hash[:version]}-#{hash[:release]}"
>+                        packages << new(providehash)
>+                    end
>                 }
>             }
>         rescue Puppet::ExecutionFailure
>@@ -44,7 +59,7 @@
>     # :ensure => version-release
>     def query
>         unless @property_hash[:epoch]
>-            cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
>+            cmd = ["-q", "--whatprovides", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
> 
>             begin
>                 output = rpm(*cmd)

Actions: View

Attachments on bug 464472: 317948