From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 29 Sep 2012 11:03:51 +0000 (+0200)
Subject: daklib/lists: output one less / for the pool/
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=f53c55d0e9b2a5c1dc003a86c7cbe06f148a48b3

daklib/lists: output one less / for the pool/

or otherwise apt-ftparchive is writing non-useful stuff into the
generated files

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/lists.py b/daklib/lists.py
old mode 100644
new mode 100755
index e4796854..5766371c
--- a/daklib/lists.py
+++ b/daklib/lists.py
@@ -42,7 +42,7 @@ def getSources(suite, component, session, timestamp = None):
     if timestamp:
         extra_cond = "AND extract(epoch from sa.created) > %d" % timestamp
     query = """
-        SELECT s.id, archive.path || '/pool/', c.name || '/' || 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
@@ -112,7 +112,7 @@ CREATE TEMP TABLE gf_candidates (
     source text);
 
 INSERT INTO gf_candidates (id, filename, path, architecture, src, source)
-    SELECT bc.id, c.name || '/' || f.filename, archive.path || '/pool/' , 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