X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=c32733cff5cabb9d0fbc4452d3270912b89a6306;hb=01c3e3976cf234ca463ded32f09ea238251b0155;hp=abc5bd97580d960353316100c42a3604aa65fe85;hpb=ed9782ad5afa4dce73ce88d412e38182329a21ad;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index abc5bd97..c32733cf 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -177,8 +177,7 @@ function release() {
 function dakcleanup() {
     log "Cleanup old packages/files"
     dak clean-suites -m 10000
-    # XXX: reactivate once clean-queues is fixed
-    #dak clean-queues
+    dak clean-queues -i "$unchecked"
 }
 
 function buildd_dir() {
@@ -208,7 +207,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 +231,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 +279,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 +303,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
@@ -404,6 +403,7 @@ function transitionsclean() {
 function dm() {
     log "Updating DM html page"
     $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
+    dak acl export-per-source dm >$exportdir/dm.txt
 }
 
 function bts() {
@@ -414,7 +414,7 @@ function bts() {
 function ddaccess() {
     # Tell our dd accessible mirror to sync itself up. Including ftp dir.
     log "Trigger dd accessible parts sync including ftp dir"
-    ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org pool
+    ${scriptsdir}/sync-dd ries-sync ries-sync1 ries-sync2 pool
 }
 
 function mirrorpush() {