p-u fix

diff --git a/TODO b/TODO
index 4dfdd1ba049eb9a88b58333aa351aa6a378d719c..62c994dd9fc81a791759c5028c5f8a4cf76f2eec 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,8 +7,6 @@ Urgent
   o Claire needs to know about sections on auric.
   o maintainers file needs overrides.
   o jenna needs to use order by to keep aj from going nutzo
-  o fix the silly rhona p-u bug
-  o have cron job symlink -dr properly
   o need to have process_it run a big try: loop so that individual
     package screws up don't kill the daily cron run.
   o Add an 'add' ability to melanie
@@ -17,6 +15,7 @@ Urgent
 Less Urgent
 -----------
 
+  o check out hardlinks [aj]
   o [Hard] Need to merge non-non-US and non-US DBs.
   o [Easy] Need to vacuum daily
   o [Easy] remove empty directories in the pool in cron.weekly or so

diff --git a/apt.conf b/apt.conf
index 361cdbc75d7c661dd61c62f4f6f95055005d3f6e..214fd1ead71c564923e5052c6874a74434d8f0f0 100644 (file)
--- a/apt.conf
+++ b/apt.conf
@@ -64,8 +64,7 @@ tree "dists/unstable/main"
 bindirectory "dists/proposed-updates"
 {
 
-   FileList "/org/ftp.debian.org/database/dists/proposed-updates_-_binary.list";
-   SourceFileList "/org/ftp.debian.org/database/proposed-updates_-_source.list";
+   FileList "/org/ftp.debian.org/database/dists/proposed-updates_-_all.list";
    Packages "dists/proposed-updates/Packages";
    Sources "dists/proposed-updates/Sources";
    Contents " ";

diff --git a/apt.conf-non-US b/apt.conf-non-US
index 65b64da18928aefe5f1abf7c31c2fc25991e1711..f6e3df6685239c9cb3c4aa11a9d7d1c8452e4c53 100644 (file)
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -54,8 +54,7 @@ tree "dists/unstable/non-US"
 bindirectory "dists/proposed-updates"
 {
 
-   FileList "/org/non-us.debian.org/database/dists/proposed-updates_-_binary.list";
-   SourceFileList "/org/non-us.debian.org/database/proposed-updates_-_source.list";
+   FileList "/org/non-us.debian.org/database/dists/proposed-updates_-_all.list";
    Packages "dists/proposed-updates/Packages";
    Sources "dists/proposed-updates/Sources";
    Contents " ";

diff --git a/cron.daily b/cron.daily
index 0acd0b9696378521f892181ef27058b4eca45618..8d3100162ab7a50fbccff75ddb283c4d9a4722a8 100755 (executable)
--- a/cron.daily
+++ b/cron.daily
@@ -53,7 +53,8 @@ jenna
 
 # FIXME
 cd /org/ftp.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

diff --git a/cron.daily-non-US b/cron.daily-non-US
index 5abaac265801290ee3c2678819016380e10093af..d6f40a5ebcf0793bb56a64248169bbe5298bfe5f 100755 (executable)
--- a/cron.daily-non-US
+++ b/cron.daily-non-US
@@ -47,7 +47,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