diff options
| author | Dominic Cleal <dcleal@redhat.com> | 2010-11-27 14:05:23 +0000 |
|---|---|---|
| committer | Dominic Cleal <dcleal@redhat.com> | 2010-11-27 14:05:23 +0000 |
| commit | 3da03bb93a32cd17302fb7e0726790e1dbd4019b (patch) | |
| tree | bf5dc3b5b1d81d777d97effd932de04637b88b7d /lib/puppet/provider/package | |
| parent | afe2d014feb2210a8666c93465d11e9c9d555f8b (diff) | |
| parent | 300371944b29c9b4f72964e223a74e1b38bb42a7 (diff) | |
| download | puppet-3da03bb93a32cd17302fb7e0726790e1dbd4019b.tar.gz puppet-3da03bb93a32cd17302fb7e0726790e1dbd4019b.tar.xz puppet-3da03bb93a32cd17302fb7e0726790e1dbd4019b.zip | |
Merge remote branch 'remotes/rgevaert/master' into tickets/masters/4258
Diffstat (limited to 'lib/puppet/provider/package')
| -rwxr-xr-x | lib/puppet/provider/package/pkgutil.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb index a5f852dd4..19a62dc1d 100755 --- a/lib/puppet/provider/package/pkgutil.rb +++ b/lib/puppet/provider/package/pkgutil.rb @@ -47,9 +47,7 @@ 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 =~ /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 |