From 3b9e191e8737c5b866213b725a70aaf9c1e0e993 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sat, 25 May 2013 19:12:23 +0200 Subject: [PATCH] Process backports-policy queue. --- config/debian/common | 21 ++++++++++++++++++--- config/debian/cron.dinstall | 8 ++++++++ config/debian/cron.unchecked | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/config/debian/common b/config/debian/common index 9e74ca3d..4469037a 100644 --- a/config/debian/common +++ b/config/debian/common @@ -95,8 +95,10 @@ function make_buildd_dir () { function punew_do() { local queue="$1" local qdir="$2" + local to="${3}" + date -u -R >> REPORT - dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" debian-release@lists.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" "${to}" -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org echo >> REPORT dak generate-packages-sources2 -s "${queue}" @@ -116,7 +118,7 @@ function punew() { log "Doing automated p-u-new processing" fi cd "${queuedir}/p-u-new" - punew_do "$1" "p-u-new" + punew_do "$1" "p-u-new" "debian-release@lists.debian.org" } function opunew() { @@ -124,7 +126,20 @@ function opunew() { log "Doing automated o-p-u-new processing" fi cd "${queuedir}/o-p-u-new" - punew_do "$1" "o-p-u-new" + punew_do "$1" "o-p-u-new" "debian-release@lists.debian.org" +} + +function backports_policy() { + local queue="backports-policy" + local qdir="/srv/backports-master.debian.org/queue/policy" + local to="backports-team@debian.org" + + if [ "${PROGRAM}" = "dinstall" ]; then + log "Doing automated ${queue} processing" + fi + + cd "${qdir}" + punew_do "${queue}" "${qdir}" "${to}" } # Do the unchecked processing, in case we have files. diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index e31ea80e..03994aab 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -225,6 +225,14 @@ GO=( ) stage $GO +GO=( + FUNC="backports_policy" + TIME="backports-policy" + ARGS="" + ERR="false" +) +stage $GO + GO=( FUNC="cruft" TIME="cruft" diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked index 7db5c284..39f62a32 100755 --- a/config/debian/cron.unchecked +++ b/config/debian/cron.unchecked @@ -103,6 +103,7 @@ pg_timestamp preunchecked >/dev/null # Process policy queues punew stable-new opunew oldstable-new +backports_policy # Finally deal with unchecked do_unchecked -- 2.39.5