X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily-non-US;h=4c0a696681543ed4ed09beb42aabac4d4079134a;hb=4b41dc06229eed89f52f397fc7df5d665fa092cf;hp=f647e7d98c9554a8abdaa249d8786c08e97fc3ee;hpb=ba18f507ebb85f05a410e94c76cbc13add116d0e;p=dak.git

diff --git a/cron.daily-non-US b/cron.daily-non-US
index f647e7d9..4c0a6966 100755
--- a/cron.daily-non-US
+++ b/cron.daily-non-US
@@ -34,9 +34,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/ftp.debian.org/scripts/apt/build/bin/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/org/ftp.debian.org/scripts/apt/build/bin/
-export PATH=$PATH:/org/ftp.debian.org/scripts/apt/build/bin/
+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/
 
 cd $incoming
 rm -f REPORT
@@ -53,9 +53,21 @@ jenna
 # FIXME
 cd /org/non-us.debian.org/database/dists/
 for i in proposed-updates_-_binary-*; do cat $i >> proposed-updates_-_binary.list; done
+
+# Generate override files
+cd $overridedir
+denise
+# FIXME
+rm -f override.potato.all3
+for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done
+
+# Generate Packages and Sources files
 cd $masterdir
 apt-ftparchive generate apt.conf-non-US
+
+# Clean out old packages
 rhona
+
 cd $indices
 charisma > .new-maintainers
 mv -f .new-maintainers Maintainers
@@ -78,6 +90,6 @@ pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 ulimit -m 90000 -d 90000 -s 10000 -v 90000
 
-run-parts --report /org/ftp.debian.org/scripts/distmnt
+run-parts --report /org/non-us.debian.org/scripts/distmnt
 
 echo Daily cron scripts successful.