[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 93f952a210ff6099c04f8c0157d79e338b901df5
Author: James Turnbull <james at lovedthanlost.net>
Date:   Thu Oct 2 07:40:58 2008 +1000

    Fixed #1586 - Specifying "fully qualified" package names in Gentoo

diff --git a/CHANGELOG b/CHANGELOG
index 87b5c09..4d574a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Fixed #1586 - Specifying "fully qualified" package names in Gentoo
+
     Fixed #1620 - Add 'sles' to Puppet confines when 'suse' is used
 
     Fixed #1585 - Allow complex 'if' and variable expressions
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
index b382d80..ae7194f 100644
--- a/lib/puppet/provider/package/portage.rb
+++ b/lib/puppet/provider/package/portage.rb
@@ -72,7 +72,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
         result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
 
-        search_field = @resource[:category] ? "--category-name" : "--name"
+        search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
         search_value = package_name
         search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
 

-- 
Puppet packaging for Debian