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

diff --git a/bin/parse-packages b/bin/parse-packages
index 399a62c..c411d34 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 use strict;
+use warnings;
 use lib './lib';
 
 $| = 1;
@@ -30,9 +31,11 @@ my $MAX_PACKAGE_POSTFIXES = 100;
 
 use DB_File;
 use Storable;
+use Deb::Versions;
 use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES );
 &Packages::Config::init( './' );
 my %packages_small = ();
+my %virtual_packages = ();
 my %package_names = ();
 my %package_postfixes = ();
 my %sources_packages = ();
@@ -47,15 +50,15 @@ my %priorities = ();
 
 $/ = "";
 
-for my $archive (@ARCHIVES) {
-    for my $suite (@SUITES) {
+for my $suite (@SUITES) {
+    my %package_names_suite = ();
+    my %packages_all_db;
+    tie %packages_all_db, "DB_File", "$DBDIR/packages_all_$suite.db.new",
+	    O_RDWR|O_CREAT, 0666, $DB_BTREE
+	    or die "Error creating DB: $!";
 
-	my %virtual_packages = ();
+    for my $archive (@ARCHIVES) {
 	print "Reading $archive/$suite...\n";
-	my %packages_all_db;
-	tie %packages_all_db, "DB_File", "$DBDIR/packages_all_$suite.db.new",
-		O_RDWR|O_CREAT, 0666, $DB_BTREE
-		or die "Error creating DB: $!";
 	open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
 	while (<PKG>) {
 		next if /^\s*$/;
@@ -71,13 +74,18 @@ for my $archive (@ARCHIVES) {
 		}
 		# 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'}) {
-			$virtual_packages{$_}{$data{'package'}}++;
+			$virtual_packages{$_}{$suite}{$data{'package'}}++;
+			$packages_small{$_} ||= {};
 		    }
 		}
 		$package_names{$data{'package'}} = 1;
+		$package_names_suite{$data{'package'}} = 1;
 		my $src = $data{'package'};
 		my $src_version = '';
 		if ($data{'source'}) {
@@ -111,11 +119,19 @@ for my $archive (@ARCHIVES) {
 		$data{'section'} = $section;
 		$data{'subsection'} = $subsection;
 		$data{'priority'} ||= '-';
-		$sections{$suite}{$archive}{$section}++;
-		$subsections{$suite}{$archive}{$subsection}++;
-		$priorities{$suite}{$archive}{$data{priority}}++;
-		$packages_small{$data{'package'}} .= "$archive $suite $data{'architecture'} ".
-			"$section $subsection $data{'priority'} $data{'version'} $sdescr\000";
+		$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);
+		$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);
+		$packages_small{$data{'package'}}{$suite}{'any'} = $pkgitem
+		    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;
@@ -129,14 +145,16 @@ for my $archive (@ARCHIVES) {
 		$packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"}
 			= $data;
 	}
+    }
 
-	foreach (keys %virtual_packages) {
-	    my @provided_by = keys %{$virtual_packages{$_}};
-	    $packages_small{$_} .= "$archive $suite virtual v v v v @provided_by\000";
-	}
-
-	untie %packages_all_db;
+    open NAMES, '>', "$DBDIR/package_names_$suite.txt.new"
+	or die "Error creating package names list: $!";
+    foreach (sort keys %package_names_suite) {
+	print NAMES "$_\n";
     }
+    close NAMES;
+
+    untie %packages_all_db;
 }
 
 print "Writing databases...\n";
@@ -144,9 +162,28 @@ my %packages_small_db;
 tie %packages_small_db, "DB_File", "$DBDIR/packages_small.db.new",
 	O_RDWR|O_CREAT, 0666, $DB_BTREE
 	or die "Error creating DB: $!";
-while (my ($k, $v) = each(%packages_small)) {
-	$v =~ s/.$//s;
-	$packages_small_db{$k} = $v;
+while (my ($pkg, $v) = each(%packages_small)) {
+	my ($res1, $res2, $res3) = ("", "", "");
+	while (my ($suite, $v2) = each %$v) {
+	    $res2 .= $v2->{'any'};
+	    while (my ($arch, $v3) = each %$v2) {
+		next if $arch eq 'any' or $v3 eq $v2->{'any'};
+		$res3 .= $v3;
+	    }
+	}
+    	
+	if (exists $virtual_packages{$pkg}) {
+		while (my ($suite, $v2) = each %{$virtual_packages{$pkg}}) {
+			$res1 .= "$suite\01".(join ' ', keys %$v2)."\01";
+		}
+	} else {
+		$res1 .= "-\01-\01";
+	}
+	$res1 =~ s/.$/\0/s;
+
+	my $res = "$res1$res2$res3";
+	$res =~ s/.$//s;
+	$packages_small_db{$pkg} = $res;
 }
 untie %packages_small_db;
 
@@ -233,6 +270,8 @@ rename("$DBDIR/sources_packages.db.new", "$DBDIR/sources_packages.db");
 for my $suite (@SUITES) {
 	rename("$DBDIR/packages_all_$suite.db.new",
 	       "$DBDIR/packages_all_$suite.db");
+	rename("$DBDIR/package_names_$suite.txt.new",
+	       "$DBDIR/package_names_$suite.txt");
 }
 rename("$DBDIR/packages_descriptions.db.new",
        "$DBDIR/packages_descriptions.db");