[dak/bpo] dinstall
dont rotate logs in cleanup
dont ignore p-a errors
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian/dinstall | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/config/debian/dinstall b/config/debian/dinstall
index 28c7ad1..c1b7489 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}/*"
--
1.5.6.5
Reply to: