From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 23 Nov 2008 22:09:02 +0000 (+0100)
Subject: mkfilesindices
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c697c655d5fe9d03c32f6601e96a758e259cccf6;p=dak.git

mkfilesindices

put the arch all debs into every architecture indice, not in the source indices...

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/scripts/debian/mkfilesindices b/scripts/debian/mkfilesindices
index cb19a3cd..03b3ea0c 100755
--- a/scripts/debian/mkfilesindices
+++ b/scripts/debian/mkfilesindices
@@ -10,7 +10,7 @@ ARCHLIST=$(tempfile)
 
 echo "Querying projectb..."
 
-echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql projectb -At | sed 's/|//;s/|all$/|/;s,^/srv/ftp.debian.org/ftp,.,' | sort >$ARCHLIST
+echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql projectb -At | sed 's/|//;s,^/srv/ftp.debian.org/ftp,.,' | sort >$ARCHLIST
 
 includedirs () {
     perl -ne 'print; while (m,/[^/]+$,) { $_=$`; print $_ . "\n" unless $d{$_}++; }'
@@ -31,9 +31,10 @@ echo "Generating sources list..."
 
 echo "Generating arch lists..."
 
-ARCHES=$( (<$ARCHLIST sed -n 's/^.*|//p'; echo amd64) | grep . | sort -u)
+ARCHES=$( (<$ARCHLIST sed -n 's/^.*|//p'; echo amd64) | grep . | grep -v all | sort -u)
 for a in $ARCHES; do
   (sed -n "s/|$a$//p" $ARCHLIST
+   sed -n 's/|all$//p' $ARCHLIST
 
    cd $base/ftp
    find ./dists -maxdepth 1 \! -type d