[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

Dominic Cleal dcleal at redhat.com
Tue May 10 08:01:23 UTC 2011


The following commit has been merged in the experimental branch:
commit 143fc744a839affd328234fca26246d49d15d3d8
Author: Dominic Cleal <dcleal at redhat.com>
Date:   Mon Nov 15 22:51:17 2010 +0000

    Ignoring lines from use_gpg and catalog fetching

diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb
index 05d189d..a5f852d 100755
--- a/lib/puppet/provider/package/pkgutil.rb
+++ b/lib/puppet/provider/package/pkgutil.rb
@@ -50,6 +50,10 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
             next if line =~ /^WARNING/
             next if line =~ /localrev\s+remoterev/
             next if line =~ /installed\s+catalog/
+            next if line =~ /^Checking integrity / # use_gpg
+            next if line =~ /^gpg: /               # gpg verification
+            next if line =~ /^=+> /                # catalog fetch
+            next if line =~ /^\d+:\d+:\d+ URL:/    # wget without -q
 
             blastsplit(line)
         end.reject { |h| h.nil? }
@@ -118,3 +122,4 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
         pkguti "-y", "-r", @resource[:name]
     end
 end
+

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list