X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdinstall.functions;h=cf84cae84a007a59f7d29fe470e00cb270968e5e;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=d02f9c37bc3a45fa0a36f005fb963dff72b62243;hpb=50db22ea5f288daa39f81138a41a509d9a41cc3e;p=dak.git diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions index d02f9c37..cf84cae8 100644 --- a/config/backports/dinstall.functions +++ b/config/backports/dinstall.functions @@ -121,7 +121,7 @@ function filelist() { function fingerprints() { log "Updating fingerprints" - dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg + dak import-keyring -L /srv/backports-master.debian.org/keyrings/keyring.gpg OUTFILE=$(mktemp) dak import-keyring --generate-users "%s" /srv/keyring.debian.org/keyrings/debian-maintainers.gpg >"${OUTFILE}" @@ -129,7 +129,7 @@ function fingerprints() { if [ -s "${OUTFILE}" ]; then /usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org < -To: +To: Subject: Debian Maintainers Keyring changes Content-Type: text/plain; charset=utf-8 X-Debian: DAK @@ -154,7 +154,7 @@ function overrides() { # FIXME rm -f override.sid.all3 - for i in main contrib non-free main.debian-installer; do cat override.lenny-backports.$i >> override.sid.all3; done + for i in main contrib non-free main.debian-installer; do cat override.squeeze-backports.$i >> override.sid.all3; done } function mpfm() { @@ -263,7 +263,20 @@ function mkfilesindices() { ARCHLIST=$(tempfile) log "Querying postgres" - 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 -At | sed 's/|//;s,^/srv/ftp-master.debian.org/ftp,.,' | sort >$ARCHLIST + local query=" + SELECT CONCAT('./pool/', c.name, '/', f.filename) AS path, a.arch_string AS arch_string + FROM files f + JOIN files_archive_map af ON f.id = af.file_id + JOIN component c ON af.component_id = c.id + JOIN archive ON af.archive_id = archive.id + LEFT OUTER JOIN + (binaries b + JOIN architecture a ON b.architecture = a.id) + ON f.id = b.file + WHERE archive.name = 'ftp-master' + ORDER BY path, arch_string + " + psql -At -c "$query" >$ARCHLIST includedirs () { perl -ne 'print; while (m,/[^/]+$,) { $_=$`; print $_ . "\n" unless $d{$_}++; }' @@ -296,12 +309,46 @@ function mkfilesindices() { log "Generating suite lists" suite_list () { - printf 'SELECT DISTINCT l.path, f.filename FROM (SELECT sa.source AS source FROM src_associations sa WHERE sa.suite = %d UNION SELECT b.source AS source FROM bin_associations ba JOIN binaries b ON (ba.bin = b.id) WHERE ba.suite = %d) s JOIN dsc_files df ON (s.source = df.source) JOIN files f ON (df.file = f.id) JOIN location l ON (f.location = l.id)\n' $1 $1 | psql -F' ' -A -t - - printf 'SELECT l.path, f.filename FROM bin_associations ba JOIN binaries b ON (ba.bin = b.id) JOIN files f ON (b.file = f.id) JOIN location l ON (f.location = l.id) WHERE ba.suite = %d\n' $1 | psql -F' ' -A -t + local suite_id="$(printf %d $1)" + local query + query=" + SELECT DISTINCT CONCAT('./pool/', c.name, '/', f.filename) + FROM + (SELECT sa.source AS source + FROM src_associations sa + WHERE sa.suite = $suite_id + UNION + SELECT esr.src_id + FROM extra_src_references esr + JOIN bin_associations ba ON esr.bin_id = ba.bin + WHERE ba.suite = $suite_id + UNION + SELECT b.source AS source + FROM bin_associations ba + JOIN binaries b ON ba.bin = b.id WHERE ba.suite = $suite_id) s + JOIN dsc_files df ON s.source = df.source + JOIN files f ON df.file = f.id + JOIN files_archive_map af ON f.id = af.file_id + JOIN component c ON af.component_id = c.id + JOIN archive ON af.archive_id = archive.id + WHERE archive.name = 'ftp-master' + " + psql -F' ' -A -t -c "$query" + + query=" + SELECT CONCAT('./pool/', c.name, '/', f.filename) + FROM bin_associations ba + JOIN binaries b ON ba.bin = b.id + JOIN files f ON b.file = f.id + JOIN files_archive_map af ON f.id = af.file_id + JOIN component c ON af.component_id = c.id + JOIN archive ON af.archive_id = archive.id + WHERE ba.suite = $suite_id AND archive.name = 'ftp-master' + " + psql -F' ' -A -t -c "$query" } - printf 'SELECT id, suite_name FROM suite\n' | psql -F' ' -At | + psql -F' ' -At -c 'SELECT id, suite_name FROM suite' | while read id suite; do [ -e $base/ftp/dists/$suite ] || continue ( @@ -312,7 +359,7 @@ function mkfilesindices() { [ "$(readlink $distdir)" != "$distname" ] || echo $distdir done ) - suite_list $id | tr -d ' ' | sed 's,^/srv/ftp-master.debian.org/ftp,.,' + suite_list $id ) | sort -u | gzip -9 > suite-${suite}.list.gz done @@ -387,7 +434,7 @@ function transitionsclean() { function dm() { log "Updating DM html page" - $scriptsdir/dm-monitor >$webdir/dm-uploaders.html + #$scriptsdir/dm-monitor >$webdir/dm-uploaders.html } function bts() { @@ -418,7 +465,7 @@ function i18n2() { dak control-suite -l testing > wheezy dak control-suite -l unstable > sid echo "${STAMP}" > timestamp - gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp + gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o timestamp.gpg timestamp rm -f md5sum md5sum * > md5sum cd ${webdir}/