config/debian-security/cron.*: update for multiarchive changes

First set of updates for multiarchive changes.

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index bfa6dd38f97a9ef8c810e12d8a95acdb993086ab..e0b846632796c05053c3a13bf1ab210b8f579373 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -79,7 +79,7 @@ if ! lockfile -r100 "$LOCKFILE"; then
 fi
 trap cleanup EXIT
 
-dak clean-queues
+dak clean-queues -i ${unchecked}
 dak clean-queues -i $disembargo
 dak clean-suites
 

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 7baf55ac10cd8b6f45b2afa38de905f52c1b881d..ba1e5751ae197880879c5e47bf0b653457576097 100755 (executable)
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -36,14 +36,16 @@ if ! lockfile -r8 "$LOCKFILE"; then
 fi
 trap cleanup EXIT
 
-cd $newstage
-changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
-if [ -n "$changes" ]; then
-    dopolicy=true
-    echo "$timestamp": ${changes:-"Nothing to do in newstage"}  >> $report
-    rsync -a -q $newstage/. /srv/queued/ftpmaster/.
-    dak process-upload -a -d "$newstage" >> $report
-fi
+for queue in embargoed; do
+    cd ${queuedir}/${queue}/COMMENTS
+    comments=$(find . -maxdepth 1 -mindepth 1 -type f '(' -name "ACCEPT.*.changes" -o -name "REJECT.*.changes" ')' | sed -e "s,./,," | xargs)
+    if [ -n "$comments" ]; then
+       dopolicy=true
+       echo "$timestamp": ${comments:-"Nothing to do for ${queue}"}  >> $report
+       dak process-policy ${queue} >> ${report}
+       find /srv/security-master.debian.org/queue/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' +
+    fi
+done
 
 cd $unchecked
 changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
@@ -76,8 +78,8 @@ if [ "x${dopolicy}x" = "xtruex" ]; then
     cd $configdir
     $configdir/map.sh
     #apt-ftparchive generate apt.conf
-    dak generate-packages-sources2
-    dak generate-releases
+    dak generate-packages-sources2 -a security
+    dak generate-releases -a security
     /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh
     sudo -u archvsync -H /home/archvsync/signal_security
 fi