Simplify

[dak.git] / cron.daily-non-US

diff --git a/cron.daily-non-US b/cron.daily-non-US
index 4c0a696681543ed4ed09beb42aabac4d4079134a..77b5626fa2c1ab180e74259e084006c04e7b4f9a 100755 (executable)
--- a/cron.daily-non-US
+++ b/cron.daily-non-US
@@ -33,10 +33,9 @@ pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 ################################################################################
 
-# temporary hack to work around the lack of an apt-utils & python-apt package
-export PYTHONPATH=$PYTHONPATH:/org/non-us.debian.org/scripts/apt/build/bin/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/org/non-us.debian.org/scripts/apt/build/bin/
-export PATH=$PATH:/org/non-us.debian.org/scripts/apt/build/bin/
+update-readmenonus
+
+################################################################################
 
 cd $incoming
 rm -f REPORT
@@ -52,7 +51,8 @@ cd $masterdir
 jenna
 # FIXME
 cd /org/non-us.debian.org/database/dists/
-for i in proposed-updates_-_binary-*; do cat $i >> proposed-updates_-_binary.list; done
+rm -f proposed-updates_-_all.list
+for i in proposed-updates_-_binary-* proposed-updates_-_source.list; do cat $i >> proposed-updates_-_all.list; done
 
 # Generate override files
 cd $overridedir
@@ -64,6 +64,8 @@ for i in main contrib non-free; do cat override.potato.$i >> override.potato.all
 # Generate Packages and Sources files
 cd $masterdir
 apt-ftparchive generate apt.conf-non-US
+# Generate Release files
+ziyi
 
 # Clean out old packages
 rhona
@@ -88,6 +90,11 @@ pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 ################################################################################
 
+# Vacuum the database
+echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE:  Skipping.*only table owner can VACUUM it$"
+
+################################################################################
+
 ulimit -m 90000 -d 90000 -s 10000 -v 90000
 
 run-parts --report /org/non-us.debian.org/scripts/distmnt