Local security-master changes

[dak.git] / config / debian-security / cron.unchecked

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 694a6dde74522eecb3a37edc706db52e3d08d7c6..4918c18b3a385bd10869a02ef6ea5281d21a409a 100755 (executable)
--- 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/katie/vars-security
+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
-jennifer -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