X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=4836f53816d10f9049f07e8b47691e9d27a57c2f;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=ae534ba60e3a60a66d8531456bacfb20ff70ea15;hpb=307eb8c383eaea0f1c9d747d54df5bc00e76272c;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index ae534ba6..4836f538 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -147,13 +147,13 @@ function overrides() { function mpfm() { log "Generating package / file mapping" - dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2 + dak make-pkg-file-mapping ftp-master | bzip2 -9 > $base/ftp/indices/package-file.map.bz2 } function packages() { log "Generating Packages and Sources files" - dak generate-packages-sources2 - dak contents generate + dak generate-packages-sources2 -a ftp-master + dak contents generate -a ftp-master } function pdiff() { @@ -171,13 +171,13 @@ function release() { done ) log "Generating Release files" - dak generate-releases + dak generate-releases -a ftp-master } function dakcleanup() { log "Cleanup old packages/files" dak clean-suites -m 10000 - dak clean-queues + dak clean-queues -i "$unchecked" } function buildd_dir() { @@ -207,7 +207,7 @@ function mkmaintainers() { log 'Creating Maintainers index ... ' cd $indices - dak make-maintainers ${scriptdir}/masterfiles/pseudo-packages.maintainers + dak make-maintainers -a ftp-master ${scriptdir}/masterfiles/pseudo-packages.maintainers gzip -9v --rsyncable Maintainers.gz gzip -9v --rsyncable Uploaders.gz } @@ -230,8 +230,20 @@ function mkfilesindices() { ARCHLIST=$(tempfile) log "Querying postgres" - local query='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 -c "$query" | sed 's/|//;s,^/srv/ftp-master.debian.org/ftp,.,' | sort >$ARCHLIST + local query=" + SELECT './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{$_}++; }' @@ -264,11 +276,42 @@ function mkfilesindices() { log "Generating suite lists" suite_list () { + local suite_id="$(printf %d $1)" local query - query="$(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)' $1 $1)" + query=" + SELECT DISTINCT './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="$(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' $1)" + query=" + SELECT './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" } @@ -283,7 +326,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 @@ -358,8 +401,8 @@ function transitionsclean() { } function dm() { - log "Updating DM html page" - $scriptsdir/dm-monitor >$webdir/dm-uploaders.html + log "Updating DM permissions page" + dak acl export-per-source dm >$exportdir/dm.txt } function bts() { @@ -370,7 +413,7 @@ function bts() { function ddaccess() { # Tell our dd accessible mirror to sync itself up. Including ftp dir. log "Trigger dd accessible parts sync including ftp dir" - ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org pool + ${scriptsdir}/sync-dd ries-sync ries-sync1 ries-sync2 pool } function mirrorpush() { @@ -440,7 +483,7 @@ function i18n2() { dak control-suite -l ${suite} >${codename} done 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}/ @@ -513,13 +556,6 @@ function process_unchecked() { sync_debbugs } -# do a run of newstage only before dinstall is on. -function newstage() { - log "Processing the newstage queue" - UNCHECKED_WITHOUT_LOCK="-p" - do_newstage -} - # Function to update a "statefile" telling people what we are doing # (more or less). # @@ -538,7 +574,7 @@ EOF # extract changelogs and stuff function changelogs() { log "Extracting changelogs" - dak make-changelog -e + dak make-changelog -e -a ftp-master mkdir -p ${exportpublic}/changelogs cd ${exportpublic}/changelogs rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .