X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=ee1b58e27a87be2d58a3e19d75bca6aa8654b637;hb=5390eff0ba7a732269f040b0a4c4a3b9a0db2733;hp=66840812987fa4e0a69ce3f4806cb14e2b08f9de;hpb=99de28a7108ed1b51100c9cad1e4862fcd35204b;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 66840812..ee1b58e2 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -146,14 +146,21 @@ function overrides() { } function mpfm() { + local archiveroot + log "Generating package / file mapping" - dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2 + for archive in "${public_archives[@]}"; do + archiveroot="$(get_archiveroot "${archive}")" + dak make-pkg-file-mapping "${archive}" | bzip2 -9 > "${archiveroot}/indices/package-file.map.bz2" + done } function packages() { log "Generating Packages and Sources files" - dak generate-packages-sources2 - dak contents generate + for archive in "${public_archives[@]}"; do + dak generate-packages-sources2 -a "${archive}" + dak contents generate -a "${archive}" + done } function pdiff() { @@ -170,14 +177,17 @@ function release() { $scriptsdir/generate-i18n-Index $dist; done ) + log "Generating Release files" - dak generate-releases + for archive in "${public_archives[@]}"; do + dak generate-releases -a "${archive}" + done } function dakcleanup() { log "Cleanup old packages/files" dak clean-suites -m 10000 - dak clean-queues + dak clean-queues -i "$unchecked" } function buildd_dir() { @@ -188,45 +198,38 @@ function buildd_dir() { } function mklslar() { - cd $ftpdir + local archiveroot + local FILENAME=ls-lR - FILENAME=ls-lR + for archive in "${public_archives[@]}"; do + archiveroot="$(get_archiveroot "${archive}")" + cd "${archiveroot}" - log "Removing any core files ..." - find -type f -name core -print0 | xargs -0r rm -v + log "Removing any core files ..." + find -type f -name core -print -delete - log "Checking permissions on files in the FTP tree ..." - find -type f \( \! -perm -444 -o -perm +002 \) -ls - find -type d \( \! -perm -555 -o -perm +002 \) -ls - - log "Checking symlinks ..." - symlinks -rd . - - log "Creating recursive directory listing ... " - rm -f .${FILENAME}.new - TZ=UTC ls -lR > .${FILENAME}.new - - if [ -r ${FILENAME}.gz ] ; then - mv -f ${FILENAME}.gz ${FILENAME}.old.gz - mv -f .${FILENAME}.new ${FILENAME} - rm -f ${FILENAME}.patch.gz - zcat ${FILENAME}.old.gz | diff -u - ${FILENAME} | gzip -9cfn - >${FILENAME}.patch.gz - rm -f ${FILENAME}.old.gz - else - mv -f .${FILENAME}.new ${FILENAME} - fi + log "Checking symlinks ..." + symlinks -rd . - gzip -9cfN ${FILENAME} >${FILENAME}.gz - rm -f ${FILENAME} + log "Creating recursive directory listing ... " + rm -f ${FILENAME}.gz + TZ=UTC ls -lR | gzip -9c --rsyncable > ${FILENAME}.gz + done } function mkmaintainers() { + local archiveroot + log 'Creating Maintainers index ... ' - cd $indices - dak make-maintainers ${scriptdir}/masterfiles/pseudo-packages.maintainers - gzip -9v --rsyncable Maintainers.gz - gzip -9v --rsyncable Uploaders.gz + for archive in "${public_archives[@]}"; do + archiveroot="$(get_archiveroot "${archive}")" + cd "${archiveroot}/indices" + + dak make-maintainers -a "${archive}" ${scriptdir}/masterfiles/pseudo-packages.maintainers + gzip -9v --rsyncable Maintainers.gz + gzip -9v --rsyncable Uploaders.gz + done } function copyoverrides() { @@ -240,6 +243,7 @@ function copyoverrides() { } function mkfilesindices() { + set +o pipefail umask 002 cd $base/ftp/indices/files/components @@ -247,7 +251,7 @@ function mkfilesindices() { log "Querying postgres" local query=" - SELECT CONCAT('./pool/', c.name, '/', f.filename) AS path, a.arch_string AS arch_string + 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 @@ -295,12 +299,17 @@ function mkfilesindices() { local suite_id="$(printf %d $1)" local query query=" - SELECT DISTINCT CONCAT('./pool/', c.name, '/', f.filename) + 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 @@ -314,7 +323,7 @@ function mkfilesindices() { psql -F' ' -A -t -c "$query" query=" - SELECT CONCAT('./pool/', c.name, '/', f.filename) + 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 @@ -367,6 +376,7 @@ function mkfilesindices() { rm -f $ARCHLIST log "Done!" + set -o pipefail } function mkchecksums() { @@ -411,8 +421,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() { @@ -423,7 +433,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() { @@ -493,7 +503,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}/ @@ -566,13 +576,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). # @@ -591,7 +594,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/. .