Merge commit 'origin/master'

[deb/packages.git] / bin / parse-packages

diff --git a/bin/parse-packages b/bin/parse-packages
index 97edffcd19666bc4a438c7b1bfe1108a4ecfd132..e069024c7ab1e20a54fb9f17b96ddca62cba7d73 100755 (executable)
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -68,11 +68,12 @@ for my $suite (@SUITES) {
 
     for my $archive (@ARCHIVES) {
        print "Reading $archive/$suite...\n";
-       if (!-d "$TOPDIR/archive/$archive/$suite/") {
+       my $suite_dir = "$TOPDIR/archive/$archive/$suite";
+       if (!-d $suite_dir) {
                 print "\tseems not to exist, skipping...\n";
                 next;
         }
-       open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
+       open PKG, "zcat $suite_dir/$what/binary-*/Packages.gz $suite_dir/$what/debian-installer/binary-*/Packages.gz|";
        while (<PKG>) {
                next if /^\s*$/;
                my $data = "";
@@ -115,10 +116,12 @@ for my $suite (@SUITES) {
                    foreach (@complete_tags) {
                        my ($facet, $tag) = split( /::/, $_, 2);
                        if ($tag =~ s/^\{(.+)\}$/$1/) {
+                           warn "pkg=$data{package} tags=$data{tag}\n" unless $facet && $tag;
                            foreach (split( /,/, $tag )) {
                                push @tags, "${facet}::$_";
                            }
                        } else {
+                           warn "pkg=$data{package} tags=$data{tag}\n" unless $facet && $tag;
                            push @tags, "${facet}::$tag";
                        }
                    }