X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Flists.py;h=5766371ce8382715937caffadb0a6b7682b679ce;hb=400aca3f47b5b52b58077e30c8c2d0fa9921034e;hp=e7f8bf968c442f3f094285d00a23566d310bb031;hpb=bd6d098b3aeea59276364c2f7da865a56a24c4f1;p=dak.git

diff --git a/daklib/lists.py b/daklib/lists.py
index e7f8bf96..5766371c 100755
--- a/daklib/lists.py
+++ b/daklib/lists.py
@@ -42,14 +42,20 @@ def getSources(suite, component, session, timestamp = None):
     if timestamp:
         extra_cond = "AND extract(epoch from sa.created) > %d" % timestamp
     query = """
-        SELECT s.id, l.path, f.filename
+        SELECT s.id, archive.path || 'pool/', c.name || '/' || f.filename
             FROM source s
             JOIN src_associations sa
                 ON s.id = sa.source AND sa.suite = :suite %s
+            JOIN suite
+                ON sa.suite = suite.id
+            JOIN archive
+                ON suite.archive_id = archive.id
             JOIN files f
                 ON s.file = f.id
-            JOIN location l
-                ON f.location = l.id AND l.component = :component
+            JOIN files_archive_map fam
+                ON fam.file_id = f.id AND fam.component_id = :component
+            JOIN component c
+                ON fam.component_id = c.id
             ORDER BY filename
     """ % extra_cond
     args = { 'suite': suite.suite_id,
@@ -64,7 +70,8 @@ def getArchAll(suite, component, architecture, type, session, timestamp = None):
     full pathname to the u(deb) file. See function writeAllList() in
     dak/generate_filelist.py for an example that uses this function.
     '''
-    query = suite.binaries.filter_by(architecture = architecture, binarytype = type)
+    query = suite.clone(session).binaries. \
+        filter_by(architecture = architecture, binarytype = type)
     if timestamp is not None:
         extra_cond = 'extract(epoch from bin_associations.created) > %d' % timestamp
         query = query.filter(extra_cond)
@@ -105,12 +112,16 @@ CREATE TEMP TABLE gf_candidates (
     source text);
 
 INSERT INTO gf_candidates (id, filename, path, architecture, src, source)
-    SELECT bc.id, f.filename, l.path, bc.architecture, bc.source as src, s.source
+    SELECT bc.id, c.name || '/' || f.filename, archive.path || 'pool/' , bc.architecture, bc.source as src, s.source
         FROM b_candidates bc
         JOIN source s ON bc.source = s.id
         JOIN files f ON bc.file = f.id
-        JOIN location l ON f.location = l.id
-        WHERE l.component = :component;
+        JOIN files_archive_map fam ON f.id = fam.file_id
+        JOIN component c ON fam.component_id = c.id
+        JOIN archive ON fam.archive_id = archive.id
+        JOIN suite ON suite.archive_id = archive.id
+
+        WHERE c.id = :component AND suite.id = :suite;
 
 WITH arch_any AS