[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

Dominic Cleal dcleal at redhat.com
Tue May 10 08:01:23 UTC 2011


The following commit has been merged in the experimental branch:
commit 69a3451cb89c819291721f810b58f3ccf08b4cc5
Author: Dominic Cleal <dcleal at redhat.com>
Date:   Mon Nov 15 22:49:46 2010 +0000

    Adding patch from Rudy Gevaert to fix not installed detection

diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb
index b8ad548..05d189d 100755
--- a/lib/puppet/provider/package/pkgutil.rb
+++ b/lib/puppet/provider/package/pkgutil.rb
@@ -67,15 +67,15 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
 
     # Split the different lines into hashes.
     def self.blastsplit(line)
-        if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/
+        if line =~ /\s*(\S+)\s+(\S+)\s+(.*)/
             hash = {}
             hash[:name] = $1
-            hash[:ensure] = if $2 == "[Not installed]"
+            hash[:ensure] = if $2 == "notinst"
                 :absent
             else
                 $2
             end
-            hash[:avail] = $5
+            hash[:avail] = $3
 
             if hash[:avail] == "SAME"
                 hash[:avail] = hash[:ensure]

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list