From: Ryan Murray <rmurray@debian.org>
Date: Mon, 10 Nov 2003 06:08:24 +0000 (+0000)
Subject: update cron.buildd to use a filelist exported from the db rather than adirectory... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bd357d9ddd5a4c62fabe3109fc18a4ebe06c050a;p=dak.git

update cron.buildd to use a filelist exported from the db rather than adirectory scan.  update apt.conf.buildd to match.
---

diff --git a/apt.conf.buildd b/apt.conf.buildd
index 09c9ed5d..9ea04491 100644
--- a/apt.conf.buildd
+++ b/apt.conf.buildd
@@ -16,16 +16,22 @@ Default
 bindirectory "incoming"
 {
    Packages "Packages";
-   Sources "Sources";
    Contents " ";
 
    BinOverride "override.sid.all3";
-   SrcOverride "override.sid.all3.src";
    BinCacheDB "packages-accepted.db";
    
-   FileList "/org/ftp.debian.org/database/dists/unstable_accepted_binary.list";
-   SourceFileList "/org/ftp.debian.org/database/dists/unstable_accepted_source.list";
+   FileList "/org/ftp.debian.org/database/dists/unstable_accepted.list";
 
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
+
+bindirectory "incoming/"
+{
+   Sources "Sources";
+   BinOverride "override.sid.all3";
+   SrcOverride "override.sid.all3.src";
+   SourceFileList "/org/ftp.debian.org/database/dists/unstable_accepted.list";
+};
+
diff --git a/cron.buildd b/cron.buildd
index 1d874c74..15e10a6f 100644
--- a/cron.buildd
+++ b/cron.buildd
@@ -16,9 +16,7 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
 		rm -f "$LOCKFILE"
 	}
 	trap cleanup 0
-	psql projectb -A -t -q -c 'SELECT filename FROM accepted_autobuild WHERE suite = 5' > $dbdir/dists/unstable_accepted.list
-	grep 'dsc$' $dbdir/dists/unstable_accepted.list > $dbdir/dists/unstable_accepted_source.list
-	grep 'deb$' $dbdir/dists/unstable_accepted.list > $dbdir/dists/unstable_accepted_binary.list
+	psql projectb -A -t -q -c "SELECT filename FROM accepted_autobuild WHERE suite = 5 AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
         cd $overridedir
         denise &>/dev/null
         rm -f override.sid.all3 override.sid.all3.src