make mirrorsplit keep non-i386 oldstable (sarge) rather than non-i386 for stable...

[dak.git] / scripts / debian / mkfilesindices

diff --git a/scripts/debian/mkfilesindices b/scripts/debian/mkfilesindices
index c5ac1d9ed65f223c05eea62aee7b61455aafaa3d..f7a14a0064ab97300583a9f7dc1bbcea048ae21e 100755 (executable)
--- a/scripts/debian/mkfilesindices
+++ b/scripts/debian/mkfilesindices
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 umask 002
 
@@ -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,^/org/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/|all$/|/;s,^/srv/ftp.debian.org/ftp,.,' | sort >$ARCHLIST
 
 includedirs () {
     perl -ne 'print; while (m,/[^/]+$,) { $_=$`; print $_ . "\n" unless $d{$_}++; }'
@@ -63,7 +63,7 @@ printf 'SELECT id, suite_name FROM suite\n' | psql -F' ' -At projectb |
         [ "$(readlink $distdir)" != "$distname" ] || echo $distdir
       done
      )
-     suite_list $id | tr -d ' ' | sed 's,^/org/ftp.debian.org/ftp,.,'
+     suite_list $id | tr -d ' ' | sed 's,^/srv/ftp.debian.org/ftp,.,'
     ) | sort -u | gzip -9 > suite-${suite}.list.gz
   done
 
@@ -83,7 +83,7 @@ for a in $ARCHES; do
     sort -u | poolfirst > ../arch-$a.files
 done
 
-(cat ../arch-i386.files ../arch-amd64.files; zcat suite-stable.list.gz) |
+(cat ../arch-i386.files ../arch-amd64.files; zcat suite-oldstable.list.gz suite-proposed-updates.list.gz) |
    sort -u | poolfirst > ../typical.files
 
 rm -f $ARCHLIST