[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.4-89-gcbbd363

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 8a3049591a2913c7a7a33407f742892bf27a2d34
Author: James Turnbull <james at lovedthanlost.net>
Date:   Fri Apr 30 18:03:02 2010 +1000

    Fixed #3655  - Puppet doesn't find installed packages with portage provider
    
    Thanks to Benedikt Böhm for the patch

diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
index 07112cb..302ca13 100644
--- a/lib/puppet/provider/package/portage.rb
+++ b/lib/puppet/provider/package/portage.rb
@@ -12,7 +12,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     defaultfor :operatingsystem => :gentoo
 
     def self.instances
-        result_format = /(\S+) (\S+) \[(\S+)\] \[(\S+)\] (\S+) (.*)/
+        result_format = /^(\S+)\s+(\S+)\s+\[(\S+)\]\s+\[(\S+)\]\s+(\S+)\s+(.*)$/
         result_fields = [:category, :name, :ensure, :version_available, :vendor, :description]
 
         version_format = "{last}<version>{}"
@@ -72,7 +72,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     end
 
     def query
-        result_format = /(\S+) (\S+) \[(\S*)\] \[(\S+)\] +(\S+) (.*)/
+        result_format = /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S+)\]\s+(\S+)\s+(.*)$/
         result_fields = [:category, :name, :ensure, :version_available, :vendor, :description]
 
         version_format = "{last}<version>{}"

-- 
Puppet packaging for Debian