Properly skip gpg-pubkey packages
authorJamie Cameron <jcameron@webmin.com>
Sun, 4 Jan 2009 06:17:32 +0000 (06:17 +0000)
committerJamie Cameron <jcameron@webmin.com>
Sun, 4 Jan 2009 06:17:32 +0000 (06:17 +0000)
software/rpm-lib.pl

index c52ee5c..fc65fb4 100644 (file)
@@ -10,7 +10,6 @@ $list = @_ ? join(' ', map { quotemeta($_) } @_) : "-a";
 &open_execute_command(RPM, "rpm -q $list --queryformat \"%{NAME}\\n%{VERSION}-%{RELEASE}\\n%{EPOCH}\\n%{GROUP}\\n%{SUMMARY}\\n\\n\"", 1, 1);
 while($packages{$i,'name'} = <RPM>) {
        chop($packages{$i,'name'});
-       next if ($packages{$i,'name'} eq 'gpg-pubkey');
        chop($packages{$i,'version'} = <RPM>);
        chop($packages{$i,'epoch'} = <RPM>);
        $packages{$i,'epoch'} = undef if ($packages{$i,'epoch'} eq '(none)');
@@ -20,6 +19,10 @@ while($packages{$i,'name'} = <RPM>) {
                last if (!/\S/);
                $packages{$i,'desc'} .= $_;
                }
+       if (packages{$i,'name'} eq 'gpg-pubkey') {
+               # Bogus pseudo-package we don't want to include
+               $i--;
+               }
        $i++;
        }
 close(RPM);