X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.unchecked;h=3cfde7a181478b272baf2bd2b6508e1c6153093d;hb=ae6d9df3ed00ec29286f22471242d34d25d3e7fc;hp=f55315c5028de92ce927db75ed48e1afcba9b4cb;hpb=263a24807c967cc2c8996679e9593dbc46abe937;p=dak.git

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index f55315c5..3cfde7a1 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -62,21 +62,26 @@ if [ -n "$changes" ]; then
     dak process-upload -a -d "$disembargo" >> $reportdis
 fi
 
-if [ "${doanything}" = "false" ] && [ "${dopolicy}" = "false" ]; then
-    echo "$timestamp": Nothing to do >> $report
-    exit 0
-fi
+# sync accepted files to ftpmaster
+cd ${base}
+find ${queuedir}/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' +
 
 # export policy queues
 for queue in embargoed; do
-    pushd ${queuedir}/${queue}
+    cd ${queuedir}/${queue}
     rm -rf export.new
+    mkdir export.new
     dak export -q ${queue} -d export.new --all
     rsync -a --delete export.new/. export/.
     rm -rf export.new
-    popd
+    cd ${base}
 done
 
+if [ "${doanything}" = "false" ] && [ "${dopolicy}" = "false" ]; then
+    echo "$timestamp": Nothing to do >> $report
+    exit 0
+fi
+
 # manage build queues
 dak manage-build-queues -a
 dak generate-packages-sources2 -a build-queues
@@ -87,6 +92,7 @@ dak generate-releases -a build-queues >/dev/null
 for suite in stable testing; do
     overridecodename=$(dak admin suite show ${suite} | awk '$1 == "OverrideCodename:" { print $2 }')
     rm -rf ${incoming}/${suite}.new
+    mkdir ${incoming}/${suite}.new
     dak export-suite -s buildd-${suite} -d ${incoming}/${suite}.new
 
     cd ${incoming}/${suite}.new
@@ -113,7 +119,6 @@ done
 
 if [ "x${dopolicy}x" = "xtruex" ]; then
     # We had something approved from a policy queue, push out new archive
-    find /srv/security-master.debian.org/queue/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' +
     dak dominate
     #dak generate-filelist
     cd $configdir