dinstall

dont rotate logs in cleanup

dont ignore p-a errors

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/dinstall b/config/debian/dinstall
index 28c7ad1d0a3f7375a0e1aa464f3bd4adccf886e3..c1b74891b0c3f66b76b43afeea22941c9c5e482d 100755 (executable)
--- a/config/debian/dinstall
+++ b/config/debian/dinstall
@@ -63,7 +63,6 @@ function ts() {
 
 # Cleanup actions
 function cleanup() {
-    savelog -c ${LOGROTATE} -j "$LOGFILE"
        rm -f ${LOCK_DAILY}
 }
 
@@ -169,8 +168,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 *.changes > REPORT
+    cat REPORT | mail -s "Install for $(date +"%D - %R")" ftpmaster@ftp-master.debian.org
     chgrp debadmin REPORT
     chmod 664 REPORT
 }
@@ -734,6 +733,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}/*"