Sync with upstream

diff --git a/ChangeLog b/ChangeLog
index 1b6199749bf6e29b6fd6d86e5245e19c1164c348..dc39277a75eb289b7fec5a9de88686e1483ae3d0 100644 (file)
--- 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 cd22bd25037382fb5e4daa59a744b8a0f3ae4531..8813d519fa1c42a98eff79db75c06deda3702929 100755 (executable)
--- 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
 
 ################################################################################