From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 3 May 2008 20:34:17 +0000 (+0200)
Subject: Sync with upstream
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d0a12f9f8e9fe208a277e020d244a55eb6a874c4;hp=a171c70ca863a7bbb705ec76703e6d29178dd41b;p=dak.git

Sync with upstream
---

diff --git a/ChangeLog b/ChangeLog
index 1b619974..dc39277a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
 	daily for some time now. And while dinstall is an OLD name, its
 	recognized pretty well within Debian
 	Also add some more timing information
+	Do not allow automated [o-]p-u-new processing to break dinstall
 
 2008-05-03  Thomas Viehmann  <tv@beamnet.de>
 
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index cd22bd25..8813d519 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -28,7 +28,6 @@ cleanup() {
     rm -f "$LOCKAC"
   fi
   echo "Cleanup"
-  rm -f "$LOGFILE"
 }
 lockfile -l 3600 $LOCKCU
 trap cleanup 0
@@ -66,14 +65,14 @@ TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 echo "Doing automated p-u-new processing"
 cd $queuedir/p-u-new
 date -u -R >> REPORT
-dak process-new -a -C COMMENTS >> REPORT
+dak process-new -a -C COMMENTS >> REPORT || true
 echo >> REPORT
 
 TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 echo "Doing automated o-p-u-new processing"
 cd $queuedir/o-p-u-new
 date -u -R >> REPORT
-dak process-new -a -C COMMENTS >> REPORT
+dak process-new -a -C COMMENTS >> REPORT || true
 echo >> REPORT
 
 ################################################################################