diff options
| author | Dominic Cleal <dcleal@redhat.com> | 2010-11-15 22:51:17 +0000 |
|---|---|---|
| committer | Dominic Cleal <dcleal@redhat.com> | 2010-11-15 22:51:17 +0000 |
| commit | 143fc744a839affd328234fca26246d49d15d3d8 (patch) | |
| tree | bc13e81f0c6227a0094ec84bbb6ce3c71bd8dde3 /lib/puppet | |
| parent | 69a3451cb89c819291721f810b58f3ccf08b4cc5 (diff) | |
| download | puppet-143fc744a839affd328234fca26246d49d15d3d8.tar.gz puppet-143fc744a839affd328234fca26246d49d15d3d8.tar.xz puppet-143fc744a839affd328234fca26246d49d15d3d8.zip | |
Ignoring lines from use_gpg and catalog fetching
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/provider/package/pkgutil.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb index 05d189d0b..a5f852dd4 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 + |