allow p-a and p-u to take a directory to parse themselves

[dak.git] / config / debian / dinstall

diff --git a/config/debian/dinstall b/config/debian/dinstall
index 28c7ad1d0a3f7375a0e1aa464f3bd4adccf886e3..a4244e37a80e760c5e28f0ff7d5435d1748c70d7 100755 (executable)
--- a/config/debian/dinstall
+++ b/config/debian/dinstall
@@ -63,8 +63,8 @@ function ts() {
 
 # Cleanup actions
 function cleanup() {
-    savelog -c ${LOGROTATE} -j "$LOGFILE"
        rm -f ${LOCK_DAILY}
+       rm -f ${LOCK_ACCEPTED}
 }
 
 # Setup the notice file to tell bad mirrors they used the wrong time
@@ -169,8 +169,8 @@ function accepted() {
     log "Processing queue/accepted"
     cd "$accepted"
     rm -f REPORT
-    dak process-accepted -pa *.changes | tee REPORT | \
-        mail -s "Install for $(date +"%D - %R")" ftpmaster@ftp-master.debian.org
+    dak process-accepted -pa -d /srv/ftp.debian.org/queue/accepted > REPORT
+    cat REPORT | mail -s "Install for $(date +"%D - %R")" ftpmaster@ftp-master.debian.org
     chgrp debadmin REPORT
     chmod 664 REPORT
 }
@@ -525,7 +525,7 @@ GO=(
 )
 stage $GO
 
-rm -f $LOCKAC
+rm -f "$LOCK_ACCEPTED"
 
 GO=(
     FUNC="msfl"
@@ -734,6 +734,8 @@ stage $GO
 
 cat "$LOGFILE" | mail -s "Log for dinstall run of ${NOW}" cron@ftp-master.debian.org
 
+savelog -c ${LOGROTATE} -j "$LOGFILE"
+
 # Now, at the very (successful) end of dinstall, make sure we remove
 # our stage files, so the next dinstall run will do it all again.
 rm -f "${stagedir}/*"