bin/keep-latest: Consider architecture field

Since keep-latest is written to merge incoming’s Packages file, which
contains various arches, into a regular one, one must not remove
packages just because there is a newer version on an other architecture.

diff --git a/bin/keep-latest b/bin/keep-latest
index eabcc10129f508f3d9bb7dff8cc35b7b98309bdf..c66c41b1200a02a8330ff15287ef0ef871fc82e4 100755 (executable)
--- a/bin/keep-latest
+++ b/bin/keep-latest
@@ -9,11 +9,11 @@ if (!@ARGV) {
        print STDERR "Usage: $0 Packages1 Packages2 ..\n";
        print STDERR "\n";
        print STDERR "This perl scripts reads the Packages files given on the command line and\n";
-       print STDERR "outputs a Packages file which contians each package exactly once, using the\n";
-       print STDERR "one with the highest version number.\n";
+       print STDERR "outputs a Packages file which contians each package/architecture pair at most\n";
+       print STDERR "once, using the one with the highest version number.\n";
        print STDERR "";
-       print STDERR "Since it only looks at Package: and Version:, it works with Sources files\n";
-       print STDERR "as well\n";
+       print STDERR "Since it only looks at Package:, Version: and Architecture:, it works with\n";
+       print STDERR "Sources files as well\n";
        exit 1;
 }
 
@@ -22,17 +22,20 @@ my %data;
 
 local($/) = ""; # read in paragraph mode
 while (<>) {
-       my( $version, $name );
+       my( $version, $name, $architecture );
+       $architecture="none"; # better to keep an entry too much than to delete an entry
        /^Package:\s*(\S+)$/mi and $name = $1;
        /^Version:\s*(\S+)$/mi and $version = $1;
+       /^Architecture:\s*(\S+)$/mi and $architecture = $1;
        if (!defined $name or !defined $version) {
                warn "Stanza without Package or Version\n";
                next;
        }
+       my $key = $name."_".$architecture;
 
-       if ((!exists $version{$name}) or version_less($version{name},$version)) {
-               $version{$name} = $version;
-               $data{$name} = $_;
+       if ((!exists $version{$key}) or version_less($version{$key},$version)) {
+               $version{$key} = $version;
+               $data{$key} = $_;
        }
 }