X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.unchecked;h=e6ccf82446492e7d7b85f404ce81ef92878f1e62;hb=0cfb277d6822ab4864bb50d70f8972978c8b9e61;hp=89baf28a6bdac267c46de736983677db4728bcb4;hpb=6296aef7a7323d391253c7107423f840374a17c4;p=dak.git

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 89baf28a..e6ccf824 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -14,10 +14,11 @@ report=$queuedir/REPORT
 reportdis=$queuedir/REPORT.disembargo
 timestamp=$(date "+%Y-%m-%d %H:%M")
 doanything=false
+dopolicy=false
 
 # So first we should go and see if any process-policy action is done
-dak process-policy embargo | mail -a "X-Debian: DAK" -e -s "Automatically accepted from embargoed" team@security.debian.org -- -F "Debian FTP Masters" -f ftonaster@ftp-master.debian.org
-dak process-policy disembargo | mail -a "X-Debian: DAK" -e -s "Automatically accepted from unembargoed" team@security.debian.org -- -F "Debian FTP Masters" -f ftonaster@ftp-master.debian.org
+dak process-policy embargoed | mail -a "X-Debian: DAK" -e -s "Automatically accepted from embargoed" team@security.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+dak process-policy unembargoed | mail -a "X-Debian: DAK" -e -s "Automatically accepted from unembargoed" team@security.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
 
 # Now, if this really did anything, we can then sync it over. Files
 # in newstage mean they are (late) accepts of security stuff, need
@@ -26,6 +27,7 @@ dak process-policy disembargo | mail -a "X-Debian: DAK" -e -s "Automatically acc
 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
@@ -53,13 +55,19 @@ if ! $doanything; then
   exit 0
 fi
 
-dak dominate
-dak generate-filelist
-cd $configdir
-$configdir/map.sh
-apt-ftparchive generate apt.conf
-dak generate-releases
-/srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh
-sudo -u archvsync -H /home/archvsync/signal_security
+dak manage-build-queues -a
 
-$masterdir/cron.buildd
+if [ "x${dopolicy}x" = "xtruex" ]; then
+    # We had something approved from a policy queue, push out new archive
+    dak dominate
+    #dak generate-filelist
+    cd $configdir
+    $configdir/map.sh
+    #apt-ftparchive generate apt.conf
+    dak generate-packages-sources2
+    dak generate-releases
+    /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh
+    sudo -u archvsync -H /home/archvsync/signal_security
+fi
+
+$configdir/cron.buildd