X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=bin%2Fparse-packages;h=c411d340c6800fe4f6b9a2de8af79beaa4454f11;hb=38aca122efcdfa5282e2fb1ec911d4085a6067bf;hp=edc97a106f3446abdfd910d9f3f036c6d15e46d6;hpb=892f09b6213c97863a80657f15b7ceb13962a776;p=deb%2Fpackages.git

diff --git a/bin/parse-packages b/bin/parse-packages
index edc97a1..c411d34 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -74,6 +74,9 @@ for my $suite (@SUITES) {
 		}
 		# Skip double package
 		next if exists($packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"});
+		# Skip arch:all for amd64&kfreebsd, too often broken
+		next if ($archive eq 'amd64' or $archive eq 'kfreebsd')
+		    and $data{architecture} eq 'all';
 
 		if ($data{'provides'}) {
 		    foreach (split /\s*,\s*/, $data{'provides'}) {
@@ -116,19 +119,19 @@ for my $suite (@SUITES) {
 		$data{'section'} = $section;
 		$data{'subsection'} = $subsection;
 		$data{'priority'} ||= '-';
-		$sections{$suite}{$archive}{$section}++;
-		$subsections{$suite}{$archive}{$subsection}++;
-		$priorities{$suite}{$archive}{$data{priority}}++;
+		$sections{$suite}{$section}++;
+		$subsections{$suite}{$subsection}++;
+		$priorities{$suite}{$data{priority}}++;
 		my $pkgitem = "$archive $suite $data{'architecture'} ".
 			"$section $subsection $data{'priority'} $data{'version'} $sdescr\0";
-		my $previtem = $packages_small{$data{'package'}}{$suite}{$data{'architecture'}}
-		    || $pkgitem;
+		my $previtem = ($packages_small{$data{'package'}}{$suite}{$data{'architecture'}}
+		    ||= $pkgitem);
 		$packages_small{$data{'package'}}{$suite}{$data{'architecture'}} = $pkgitem
-		    if version_cmp($data{'version'}, (split /\s/o, $previtem)[6]) >= 0;
-		$previtem = $packages_small{$data{'package'}}{$suite}{'any'}
-		    || $pkgitem;
+		    if version_cmp($data{'version'}, (split /\s/o, $previtem)[6]) > 0;
+		$previtem = ($packages_small{$data{'package'}}{$suite}{'any'}
+		    ||= $pkgitem);
 		$packages_small{$data{'package'}}{$suite}{'any'} = $pkgitem
-		    if version_cmp($data{'version'}, (split /\s/o, $previtem)[6]) >= 0;
+		    if version_cmp($data{'version'}, (split /\s/o, $previtem)[6]) > 0;
 		$sources_packages{$src} .=
 			"$archive $suite $data{'package'} $data{'version'} $data{'architecture'}\000";
 		$data{archive} = $archive;