Merge branch 'master' into security

[dak.git] / config / debian / cron.dinstall

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 74d2489f534443f633eb2db758217c953b2c6e80..cb326fc6b79116e317de59cfb62973ac847c36f4 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -70,6 +70,7 @@ cd $configdir
 $scriptsdir/update-bugdoctxt
 $scriptsdir/update-mirrorlists
 $scriptsdir/update-mailingliststxt
+$scriptsdir/update-pseudopackages.sh
 
 ################################################################################
 
@@ -94,7 +95,7 @@ ts
 echo "Synchronizing i18n package descriptions"
 # First sync their newest data
 cd ${scriptdir}/i18nsync
-rsync -aq --delete --delete-after ddtp-sync:/does/not/matter .
+rsync -aq --delete --delete-after ddtp-sync:/does/not/matter . || true
 
 # Now check if we still know about the packages for which they created the files
 # is the timestamp signed by us?
@@ -105,7 +106,7 @@ if $(gpgv --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.g
     # do we have the dir still?
     if [ -d ${scriptdir}/i18n/${TSTAMP} ]; then
         # Lets check!
-        if $(${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}); then
+        if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then
                        # Yay, worked, lets copy around
                        for dir in lenny sid; do
                                if [ -d dists/${dir}/ ]; then
@@ -337,6 +338,21 @@ echo "Compress old psql backups"
 
 ts
 
+echo "Removing old dinstall logfiles"
+(cd $logdir
+       find -maxdepth 1 -mindepth 1 -type f -name 'dinstall_*' -mtime +60 | 
+       while read dumpname; do
+               echo "Removing $dumpname"
+               rm -f "$dumpname"
+       done
+
+       find -maxdepth 1 -mindepth 1 -type f -name 'weekly_*' -mtime +60 | 
+       while read dumpname; do
+               echo "Removing $dumpname"
+               rm -f "$dumpname"
+       done
+)
+
 echo "Finally, all is done, sending mail and compressing logfile"
 exec > /dev/null 2>&1