From 2725fb3b4821543f2e17f5eaf51d9a95fa177f38 Mon Sep 17 00:00:00 2001 From: rgevaert Date: Tue, 16 Nov 2010 12:03:52 +0100 Subject: Add comments that explain what we are ignoring in the package and remove legacy output --- lib/puppet/provider/package/pkgutil.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb index a5f852dd4..1d699f3d2 100755 --- a/lib/puppet/provider/package/pkgutil.rb +++ b/lib/puppet/provider/package/pkgutil.rb @@ -47,9 +47,9 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d list = output.split("\n").collect do |line| next if line =~ /^#/ - next if line =~ /^WARNING/ - next if line =~ /localrev\s+remoterev/ - next if line =~ /installed\s+catalog/ + #next if line =~ /^WARNING/ + #next if line =~ /localrev\s+remoterev/ + next if line =~ /installed\s+catalog/ # header of package list next if line =~ /^Checking integrity / # use_gpg next if line =~ /^gpg: / # gpg verification next if line =~ /^=+> / # catalog fetch -- cgit From 300371944b29c9b4f72964e223a74e1b38bb42a7 Mon Sep 17 00:00:00 2001 From: rgevaert Date: Wed, 17 Nov 2010 20:13:41 +0100 Subject: These regular expressions will not match anything. pkgutil doesn't output anything that can be matched. --- lib/puppet/provider/package/pkgutil.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib') diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb index 1d699f3d2..19a62dc1d 100755 --- a/lib/puppet/provider/package/pkgutil.rb +++ b/lib/puppet/provider/package/pkgutil.rb @@ -47,8 +47,6 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d list = output.split("\n").collect do |line| next if line =~ /^#/ - #next if line =~ /^WARNING/ - #next if line =~ /localrev\s+remoterev/ next if line =~ /installed\s+catalog/ # header of package list next if line =~ /^Checking integrity / # use_gpg next if line =~ /^gpg: / # gpg verification -- cgit