From: Ansgar Burchardt Date: Sat, 6 Jul 2013 22:36:32 +0000 (+0200) Subject: Switch to a different way to update backports.debian.org mirrors. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=800a4cfe507f7d2359d15db9b03cc778760df0b8;p=dak Switch to a different way to update backports.debian.org mirrors. --- diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 2a2fe157..701754ca 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -444,6 +444,14 @@ GO=( ) stage $GO & +GO=( + FUNC="mirrorpush-backports" + TIME="mirrorpush-backports" + ARGS="" + ERR="false" +) +stage $GO & + GO=( FUNC="i18n2" TIME="i18n 2" diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 3025c441..4456d8dc 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -501,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") diff --git a/scripts/debian/sync-dd b/scripts/debian/sync-dd index 835442a0..1c9b95b6 100755 --- a/scripts/debian/sync-dd +++ b/scripts/debian/sync-dd @@ -103,18 +103,6 @@ if lockfile -r3 "${lockfile}"; then /srv/ftp.debian.org/ "${host2}:/srv/ftp.debian.org/" # command for the remote side: # command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/ftp.debian.org/" - - if [[ ${mode} == pool ]]; then - # Sync backports - rsync -aH -B8192 \ - --delete --delete-after \ - --timeout 3600 \ - -e 'ssh -o ConnectTimeout=30 -o SetupTimeout=30' \ - /srv/backports-master.debian.org/mirror/ \ - ries-sync3:/srv/backports.debian.org/htdocs/debian-backports/ - # And now tell static.debian.org that something changed - /usr/local/bin/static-update-component backports.debian.org - fi else echo "Couldn't get the lock, not syncing" exit 0