From: Joerg Jaspert Date: Sat, 21 Feb 2009 20:09:04 +0000 (+0100) Subject: dinstall X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=cd790030954ecebf32306a1f67c32c4ac5309698;p=dak.git dinstall dont rotate logs in cleanup dont ignore p-a errors Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/dinstall b/config/debian/dinstall index 28c7ad1d..c1b74891 100755 --- 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}/*"