From: James Troup <james@nocrew.org>
Date: Tue, 23 Jan 2001 00:47:38 +0000 (+0000)
Subject: p-u fix
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=46007f95da368217ca0bbdab3c4893157c6537e4;p=dak.git

p-u fix
---

diff --git a/TODO b/TODO
index 4dfdd1ba..62c994dd 100644
--- 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 361cdbc7..214fd1ea 100644
--- 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 65b64da1..f6e3df66 100644
--- 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 0acd0b96..8d310016 100755
--- 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 5abaac26..d6f40a5e 100755
--- 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