X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=4456d8dcfecef28434ca0b1012143c9d958918bf;hb=d45b6f2ab1c178c6a889173ca98a5f1ca640ff72;hp=2913dd335fe58d7fcba9bf467381bdf7f14957fa;hpb=c9737dd6c57fb3254544f43b08ca91fe1ba5369b;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 2913dd33..4456d8dc 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -174,15 +174,6 @@ function pdiff() { } function release() { - # XXX: disable once we can remove i18n/Index (#649314) - log "Generating i18n/Index" - ( - cd "$ftpdir/dists"; - for dist in testing unstable experimental proposed-updates testing-proposed-updates; do - $scriptsdir/generate-i18n-Index $dist; - done - ) - log "Generating Release files" for archive in "${public_archives[@]}"; do dak generate-releases -a "${archive}" @@ -195,13 +186,6 @@ function dakcleanup() { dak clean-queues -i "$unchecked" } -function buildd_dir() { - # Rebuilt the buildd dir to avoid long times of 403 - log "Regenerating the buildd incoming dir" - STAMP=$(date "+%Y%m%d%H%M") - make_buildd_dir -} - function mklslar() { local archiveroot local FILENAME=ls-lR @@ -517,6 +501,11 @@ function mirrorpush() { sudo -H -u archvsync /home/archvsync/runmirrors -a backports > ~dak/runmirrorsbpo.log 2>&1 & } +function mirrorpush-backports() { + log "Syncing backports mirror" + sudo -u backports /home/backports/bin/update-archive +} + function i18n2() { log "Exporting package data foo for i18n project" STAMP=$(date "+%Y%m%d%H%M") @@ -622,11 +611,12 @@ function changelogs() { rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. . sudo -H -u staticsync /usr/local/bin/static-update-component ftp-master.metadata.debian.org >/dev/null 2>&1 & - #dak make-changelog -e -a backports - #[ -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml ] && xz -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml - #mkdir -p /srv/backports-master.debian.org/rsync/export/changelogs - #cd /srv/backports-master.debian.org/rsync/export/changelogs - #rsync -aHW --delete --delete-after --ignore-errors /srv/backports-master.debian.org/export/changelogs/. . + dak make-changelog -e -a backports + [ -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml ] && xz -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml + mkdir -p /srv/backports-master.debian.org/rsync/export/changelogs + cd /srv/backports-master.debian.org/rsync/export/changelogs + rsync -aHW --delete --delete-after --ignore-errors /srv/backports-master.debian.org/export/changelogs/. . + remove_changelog_lock trap remove_changelog_lock EXIT TERM HUP INT QUIT fi }