[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit bf7d650a65bc4b97ac72ddf38647766229b3182e
Author: Markus Roberts <Markus at reality.com>
Date:   Fri Dec 11 08:23:07 2009 -0800

    Fix for #2900 (rug output parsing too specific)
    
    Andrew Forgue's suggested patch; changes the regular expression to
    accept any non-space characters, non-vertical bar characters in a
    version "number".
    
    Examples
    
    v | SLES10-SP1-Updates |  | resmgr          | 0.9.8_SVNr75-18.9  | x86_64
    v | SLES10-SP1-Updates |  | wireless-tools  | 28pre13-22.16.2    | x86_64
    
    Signed-off-by: Markus Roberts <Markus at reality.com>

diff --git a/lib/puppet/provider/package/rug.rb b/lib/puppet/provider/package/rug.rb
index ca27cbb..9f09b35 100644
--- a/lib/puppet/provider/package/rug.rb
+++ b/lib/puppet/provider/package/rug.rb
@@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
         #rug can only get a list of *all* available packages?
         output = rug "list-updates"
 
-        if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([0-9\.\-]+)/
+        if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s\|]+)/
             return $1
         else
             # rug didn't find updates, pretend the current

-- 
Puppet packaging for Debian