X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.unchecked;h=4918c18b3a385bd10869a02ef6ea5281d21a409a;hb=db4d3b713caf2fdc24b44d08214a6a9b1b006f17;hp=5b2800865c7daa1091e20cc5c73cc16cf9f387b9;hpb=17cec6a95a357324d0292155242310aed6757ebf;p=dak.git

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 5b280086..4918c18b 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -1,22 +1,36 @@
 #! /bin/sh
 
 set -e
-export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
+export SCRIPTVARS=/org/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
+report=$queuedir/REPORT
+reportdis=$queuedir/REPORT.disembargo
+timestamp=$(date "+%Y-%m-%d %H:%M")
+doanything=false
+
 cd $unchecked
+changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
+if [ -n "$changes" ]; then
+  doanything=true
+  echo "$timestamp": "$changes"  >> $report
+  dak process-unchecked -a $changes >> $report
+  echo "--" >> $report
+fi
 
+cd $disembargo
 changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
-report=$queuedir/REPORT
-timestamp=$(date "+%Y-%m-%d %H:%M")
 
-if [ -z "$changes" ]; then
-  echo "$timestamp": Nothing to do >> $report
-  exit 0;
-fi;
+if [ -n "$changes" ]; then
+  doanything=true
+  echo "$timestamp": "$changes"  >> $reportdis
+  dak process-unchecked -a $changes >> $reportdis
+  echo "--" >> $reportdis
+fi
 
-echo "$timestamp": "$changes"  >> $report
-dak process-unchecked -a $changes >> $report
-echo "--" >> $report
+if ! $doanything; then
+  echo "$timestamp": Nothing to do >> $report
+  exit 0
+fi
 
-sh $masterdir/cron.buildd-security
+sh $masterdir/cron.buildd