From 58ac7d385ebaa8755fe44df5a3d2db98b4bf4693 Mon Sep 17 00:00:00 2001
From: Juerg Walz <jwalz@pobox.com>
Date: Tue, 8 Mar 2011 12:39:25 +0800
Subject: (#4258) pkgutil provider: better handling of short package names

---
 lib/puppet/provider/package/pkgutil.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb
index 0e2056b54..4a87932a8 100755
--- a/lib/puppet/provider/package/pkgutil.rb
+++ b/lib/puppet/provider/package/pkgutil.rb
@@ -56,7 +56,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
 
     if hash[:justme]
       # Ensure we picked up the package line, not any pkgutil noise.
-      list.reject! { |h| h[:name] !~ /#{hash[:justme]}$/ }
+      list.reject! { |h| h[:name] != hash[:justme] }
       return list[-1]
     else
       list.reject! { |h| h[:ensure] == :absent }
@@ -80,6 +80,10 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
       end
       hash[:avail] = $3
 
+      if justme !~ /^[A-Z]+/
+        hash[:name].sub! /^[A-Z]+/, ''
+      end
+
       if hash[:avail] =~ /^SAME\s*$/
         hash[:avail] = hash[:ensure]
       end
-- 
cgit