Merge remote-tracking branch 'ansgar/pu/multiarchive-2'

[dak.git] / config / debian / dinstall.functions

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index abc5bd97580d960353316100c42a3604aa65fe85..a3547b30354817626cd20d1505e029e5ecb25409 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -208,7 +208,7 @@ function mkmaintainers() {
     log 'Creating Maintainers index ... '
 
     cd $indices
-    dak make-maintainers ${scriptdir}/masterfiles/pseudo-packages.maintainers
+    dak make-maintainers -a ftp-master ${scriptdir}/masterfiles/pseudo-packages.maintainers
     gzip -9v --rsyncable <Maintainers >Maintainers.gz
     gzip -9v --rsyncable <Uploaders >Uploaders.gz
 }
@@ -232,7 +232,7 @@ function mkfilesindices() {
 
     log "Querying postgres"
     local query="
-      SELECT CONCAT('./pool/', c.name, '/', f.filename) AS path, a.arch_string AS arch_string
+      SELECT './pool/' || c.name || '/' || f.filename AS path, a.arch_string AS arch_string
       FROM files f
       JOIN files_archive_map af ON f.id = af.file_id
       JOIN component c ON af.component_id = c.id
@@ -280,7 +280,7 @@ function mkfilesindices() {
        local suite_id="$(printf %d $1)"
        local query
        query="
-          SELECT DISTINCT CONCAT('./pool/', c.name, '/', f.filename)
+          SELECT DISTINCT './pool/' || c.name || '/' || f.filename
           FROM
             (SELECT sa.source AS source
                FROM src_associations sa
@@ -304,7 +304,7 @@ function mkfilesindices() {
        psql -F' ' -A -t -c "$query"
 
        query="
-          SELECT CONCAT('./pool/', c.name, '/', f.filename)
+          SELECT './pool/' || c.name || '/' || f.filename
           FROM bin_associations ba
           JOIN binaries b ON ba.bin = b.id
           JOIN files f ON b.file = f.id