X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=fd546a902fa8b226a1ee267dc9668e94b60c5d9d;hb=2de2a91cbde91f3ecef5475829f7620edd94a14b;hp=f6287a8da7337a7aea5a2dcd0eb7a85f18779fba;hpb=61353b2503f77600cac59fba7aceef37e9f15f4a;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index f6287a8d..fd546a90 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -9,6 +9,11 @@ function remove_daily_lock() { rm -f $LOCK_DAILY } +# Remove changelog lock +function remove_changelog_lock() { + rm -f $LOCK_CHANGELOG +} + # Remove all locks function remove_all_locks() { rm -f $LOCK_DAILY $LOCK_ACCEPTED @@ -240,7 +245,7 @@ function mkmaintainers() { function copyoverrides() { log 'Copying override files into public view ...' - for ofile in ${overridedir}/override.{squeeze,wheezy,sid}.{,extra.}{main,contrib,non-free}*; do + for ofile in ${overridedir}/override.{squeeze,wheezy,jessie,sid}.{,extra.}{main,contrib,non-free}*; do bname=${ofile##*/} gzip -9cv --rsyncable ${ofile} > ${indices}/${bname}.gz chmod g+w ${indices}/${bname}.gz @@ -543,12 +548,6 @@ function stats() { dak stats pkg-nums > $webdir/pkg-nums } -function aptftpcleanup() { - log "Clean up apt-ftparchive's databases" - cd $configdir - apt-ftparchive -q clean apt.conf -} - function cleantransactions() { log "Cleanup transaction ids older than 3 months" cd $base/backup/ @@ -614,19 +613,22 @@ EOF # extract changelogs and stuff function changelogs() { - log "Extracting changelogs" - dak make-changelog -e -a ftp-master - [ -f ${exportdir}/changelogs/filelist.yaml ] && xz -f ${exportdir}/changelogs/filelist.yaml - mkdir -p ${exportpublic}/changelogs - cd ${exportpublic}/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/. . + if lockfile -r3 $LOCK_CHANGELOG; then + log "Extracting changelogs" + dak make-changelog -e -a ftp-master + [ -f ${exportdir}/changelogs/filelist.yaml ] && xz -f ${exportdir}/changelogs/filelist.yaml + mkdir -p ${exportpublic}/changelogs + cd ${exportpublic}/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/. . + trap remove_changelog_lock EXIT TERM HUP INT QUIT + fi } function gitpdiff() {