]> git.donarmstrong.com Git - debbugs.git/commitdiff
Handle Packages.xz etc.
authorDon Armstrong <don@donarmstrong.com>
Sat, 12 Nov 2016 22:55:38 +0000 (14:55 -0800)
committerDon Armstrong <don@donarmstrong.com>
Sat, 12 Nov 2016 22:55:38 +0000 (14:55 -0800)
Handle the removal of packages.gz while building the versions database

examples/debian/versions/build-mldbm.pl [deleted file]
examples/debian/versions/build-versions-db [new file with mode: 0755]
examples/debian/versions/update-mldbm

diff --git a/examples/debian/versions/build-mldbm.pl b/examples/debian/versions/build-mldbm.pl
deleted file mode 100755 (executable)
index 4b4d359..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/perl -w
-use strict;
-use MLDBM qw(DB_File Storable);
-use Fcntl;
-
-$MLDBM::DumpMeth=q(portable);
-
-my %db;
-my %db2;
-tie %db, "MLDBM", "versions.idx.new", O_CREAT|O_RDWR, 0664
-    or die "tie versions.idx.new: $!";
-tie %db2, "MLDBM", "versions_time.idx.new",O_CREAT|O_RDWR, 0664
-     or die "tie versions_time.idx.new failed: $!";
-
-my $archive = shift;
-my $dist = shift;
-my $arch = shift;
-print "$archive/$dist/$arch\n";
-
-my $time = time;
-my ($p, $v);
-my $extra_source_only = 0;
-while (<>) {
-    if (/^Package: (.*)/)    { $p = $1; }
-    elsif (/^Version: (.*)/) { $v = $1; }
-    elsif (/^Extra-Source-Only: yes/) {
-        $extra_source_only = 1;
-    }
-    elsif (/^$/) {
-        if ($extra_source_only) {
-            $extra_source_only = 0;
-            next;
-        }
-        update_package_version($p,$v,$time);
-    }
-}
-update_package_version($p,$v,$time) unless $extra_source_only;
-
-sub update_package_version {
-    my ($p,$v,$t) = @_;
-       # see MLDBM(3pm)/BUGS
-       my $tmp = $db{$p};
-       # we allow multiple versions in an architecture now; this
-       # should really only happen in the case of source, however.
-       push @{$tmp->{$dist}{$arch}}, $v;
-       $db{$p} = $tmp;
-       $tmp = $db2{$p};
-       $tmp->{$dist}{$arch}{$v} = $time if not exists
-            $tmp->{$dist}{$arch}{$v};
-       $db2{$p} = $tmp;
-}
-
diff --git a/examples/debian/versions/build-versions-db b/examples/debian/versions/build-versions-db
new file mode 100755 (executable)
index 0000000..16eb536
--- /dev/null
@@ -0,0 +1,179 @@
+#!/usr/bin/perl
+# build-versions-db builds the versions mldmb database
+# and is released under the terms of the GNU GPL version 3, or any
+# later version, at your option. See the file README and COPYING for
+# more information.
+# Copyright 2016 by Don Armstrong <don@donarmstrong.com>.
+
+
+use warnings;
+use strict;
+
+use Getopt::Long;
+use Pod::Usage;
+
+=head1 NAME
+
+build-versions-db -- builds source and source maintainers file
+
+=head1 SYNOPSIS
+
+    build-versions-db [options] versions.idx.new versions.idx.new \
+           /srv/bugs.debian.org/versions/indices/ftp
+
+ Options:
+   --debug, -d debugging level (Default 0)
+   --help, -h display this help
+   --man, -m display manual
+
+=head1 OPTIONS
+
+=over
+
+=item B<--debug, -d>
+
+Debug verbosity. (Default 0)
+
+=item B<--help, -h>
+
+Display brief usage information.
+
+=item B<--man, -m>
+
+Display this manual.
+
+=back
+
+=head1 EXAMPLES
+
+     build-versions-db versions.idx.new versions.idx.new \
+           /srv/bugs.debian.org/versions/indices/ftp \
+           stable
+
+=cut
+
+
+use vars qw($DEBUG);
+use Debbugs::Versions::Dpkg;
+use IO::Uncompress::AnyUncompress;
+use MLDBM qw(DB_File Storable);
+use Fcntl;
+
+my %options = (debug           => 0,
+               help            => 0,
+               man             => 0,
+               compprefix      => '',
+              );
+
+GetOptions(\%options,
+           'hostname=s',
+           'compprefix=s',
+           'debug|d+','help|h|?','man|m');
+
+pod2usage() if $options{help};
+pod2usage({verbose=>2}) if $options{man};
+
+$DEBUG = $options{debug};
+
+my @USAGE_ERRORS;
+if (not defined $options{hostname}) {
+    push @USAGE_ERRORS,"You must provide a hostname";
+}
+
+if (not @ARGV >= 4) {
+    push @USAGE_ERRORS,
+        "You must provide at least four arguments, two databases, ".
+        "a top level directory and at least one suite";
+}
+
+pod2usage(join("\n",@USAGE_ERRORS)) if @USAGE_ERRORS;
+
+
+my $versions = shift @ARGV;
+my $versions_time = shift @ARGV;
+my $toplevel = shift @ARGV;
+my @suites = @ARGV;
+
+$MLDBM::DumpMeth=q(portable);
+
+my $time = time;
+
+my %db;
+my %db2;
+tie %db, "MLDBM", $versions, O_CREAT|O_RDWR, 0664
+    or die "tie $versions: $!";
+tie %db2, "MLDBM", $versions_time,O_CREAT|O_RDWR, 0664
+     or die "tie $versions_time failed: $!";
+
+# Read Package, Version, and Source fields from a Packages.gz file.
+sub read_packages {
+    my ($packages, $component,$arch,$dist) = @_;
+    my $PACKAGES = IO::Uncompress::AnyUncompress->new($packages) or
+        die "Unable to open $packages for reading: $!";
+    local $_;
+    local $/ = '';     # paragraph mode
+
+    print STDERR "reading packages $packages\n" if $DEBUG;
+    for (<$PACKAGES>) {
+       /^Package: (.+)/im or next;
+       my $pkg = $1;
+       /^Version: (.+)/im or next;
+       my $ver = $1;
+       my $extra_source_only = 0;
+       if (/^Extra-Source-Only: yes/im) {
+           $extra_source_only = 1;
+       }
+       update_package_version($dist,$arch,$pkg,$ver,$time) unless
+           $extra_source_only;
+    }
+}
+
+
+sub update_package_version {
+    my ($d,$a,$p,$v,$t) = @_;
+    # see MLDBM(3pm)/BUGS
+    my $tmp = $db{$p};
+    # we allow multiple versions in an architecture now; this
+    # should really only happen in the case of source, however.
+    push @{$tmp->{$d}{$a}}, $v;
+    $db{$p} = $tmp;
+    $tmp = $db2{$p};
+    $tmp->{$d}{$a}{$v} = $time if not exists
+       $tmp->{$d}{$a}{$v};
+    $db2{$p} = $tmp;
+}
+
+# Iterate through all Packages and Sources files.
+for my $suite (@suites) {
+    my $suitedir = "$toplevel/$suite";
+
+    for my $component ('main', 'main/debian-installer',
+                      'contrib', 'non-free') {
+       my $componentdir = "$suitedir/$component";
+       next unless -d $componentdir;
+       my $COMPONENT;
+       opendir $COMPONENT, $componentdir or die "opendir $componentdir: $!";
+
+       # debian-installer is really a section rather than a component
+       # (ugh).
+       (my $viscomponent = $component) =~ s[/.*][];
+       $viscomponent = $options{compprefix} . $viscomponent;
+
+       my $sources = (grep { -f $_ } glob "$suitedir/$component/source/Sources.*")[0];
+       next unless defined $sources;
+       read_packages($sources, $viscomponent,'source',$suite);
+
+       for my $arch (readdir $COMPONENT) {
+           next unless $arch =~ s/^binary-//;
+           my $archdir = "$componentdir/binary-$arch";
+
+           my $packages = (grep { -f $_ } glob("$archdir/Packages.*"))[0];
+           next unless defined $packages;
+           read_packages($packages, $viscomponent,$arch,$suite);
+       }
+
+       closedir $COMPONENT;
+    }
+}
+
+
index 3bb03bc765302addad8ba1d7f4ac9dee27f53929..50ce8804b8630fd2b65eda37736739ec815d3f21 100755 (executable)
@@ -13,54 +13,13 @@ if [ -e versions_time.idx ]; then
     cp versions_time.idx versions_time.idx.new;
 fi;
 
-set -e
-for archive in $ARCHIVES; do
-    case $archive in
-       ftp)
-           SUITES='oldstable stable proposed-updates testing testing-proposed-updates unstable experimental'
-           di_main='main main/debian-installer'
-           ;;
-       nonus)
-           SUITES='oldstable'
-           di_main='main'
-           ;;
-       security)
-           SUITES='oldstable stable testing'
-           di_main='main'
-           ;;
-    esac
-    for suite in $SUITES; do
-        if [ "$suite" != "oldstable" ] || [ -d /org/bugs.debian.org/etc/indices/$archive/$suite ]; then
-       case $suite in
-           oldstable|stable|proposed-updates)
-               ARCHES='alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc'
-               ;;
-           testing|testing-proposed-updates)
-               ARCHES='alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc'
-               ;;
-           unstable|experimental)
-               ARCHES='alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc'
-               ;;
-       esac
-       case $suite in
-           oldstable|experimental)
-               COMPONENTS='main contrib non-free'
-               ;;
-           stable|proposed-updates|testing|testing-proposed-updates|unstable)
-               COMPONENTS="$di_main contrib non-free"
-               ;;
-       esac
-       for component in $COMPONENTS; do
-           for arch in $ARCHES; do
-               zcat "/org/bugs.debian.org/etc/indices/$archive/$suite/$component/binary-$arch/Packages.gz" | ../bin/build-mldbm.pl "$archive" "$suite" "$arch"
-           done
-           if [ "$component" != main/debian-installer ]; then
-               zcat "/org/bugs.debian.org/etc/indices/$archive/$suite/$component/source/Sources.gz" | ../bin/build-mldbm.pl "$archive" "$suite" source
-           fi
-       done
-       fi
-    done
-done
+../bin/build-versions-db versions.idx.new versions_time.idx.new \
+                        /srv/bugs.debian.org/versions/indices/ftp \
+                        oldstable stable proposed-updates \
+                        testing \
+                        testing-proposed-updates \
+                        unstable \
+                        experimental;
 
 # This removes old versions
 ../bin/versions_time_cleanup
@@ -69,4 +28,4 @@ chmod 664 versions.idx.new
 mv versions.idx.new versions.idx
 
 chmod 664 versions_time.idx.new
-mv versions_time.idx.new versions_time.idx
\ No newline at end of file
+mv versions_time.idx.new versions_time.idx