X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=2a5ed8b692fcd34a744f7a61c679f39b82a60d43;hb=8e737f25a776e74800e5c31e3e2d62c90ad13f55;hp=c21c10a2fc73a13157a4ad4a1cdefe8eafdc623d;hpb=e02c623be4a83422766d20611c6fadde362be98e;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index c21c10a2..2a5ed8b6 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -147,13 +147,13 @@ function overrides() {
 
 function mpfm() {
     log "Generating package / file mapping"
-    dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
+    dak make-pkg-file-mapping ftp-master | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
 }
 
 function packages() {
     log "Generating Packages and Sources files"
-    dak generate-packages-sources2
-    dak contents generate
+    dak generate-packages-sources2 -a ftp-master
+    dak contents generate -a ftp-master
 }
 
 function pdiff() {
@@ -171,13 +171,13 @@ function release() {
         done
     )
     log "Generating Release files"
-    dak generate-releases
+    dak generate-releases -a ftp-master
 }
 
 function dakcleanup() {
     log "Cleanup old packages/files"
     dak clean-suites -m 10000
-    dak clean-queues
+    dak clean-queues -i "$unchecked"
 }
 
 function buildd_dir() {
@@ -193,38 +193,21 @@ function mklslar() {
     FILENAME=ls-lR
 
     log "Removing any core files ..."
-    find -type f -name core -print0 | xargs -0r rm -v
-
-    log "Checking permissions on files in the FTP tree ..."
-    find -type f \( \! -perm -444 -o -perm +002 \) -ls
-    find -type d \( \! -perm -555 -o -perm +002 \) -ls
+    find -type f -name core -print -delete
 
     log "Checking symlinks ..."
     symlinks -rd .
 
     log "Creating recursive directory listing ... "
-    rm -f .${FILENAME}.new
-    TZ=UTC ls -lR > .${FILENAME}.new
-
-    if [ -r ${FILENAME}.gz ] ; then
-        mv -f ${FILENAME}.gz ${FILENAME}.old.gz
-        mv -f .${FILENAME}.new ${FILENAME}
-        rm -f ${FILENAME}.patch.gz
-        zcat ${FILENAME}.old.gz | diff -u - ${FILENAME} | gzip -9cfn - >${FILENAME}.patch.gz
-        rm -f ${FILENAME}.old.gz
-    else
-        mv -f .${FILENAME}.new ${FILENAME}
-    fi
-
-    gzip -9cfN ${FILENAME} >${FILENAME}.gz
-    rm -f ${FILENAME}
+    rm -f ${FILENAME}.gz
+    TZ=UTC ls -lR | gzip -9c --rsyncable > ${FILENAME}.gz
 }
 
 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
 }
@@ -240,6 +223,7 @@ function copyoverrides() {
 }
 
 function mkfilesindices() {
+    set +o pipefail
     umask 002
     cd $base/ftp/indices/files/components
 
@@ -247,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
@@ -295,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
@@ -319,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
@@ -372,6 +356,7 @@ function mkfilesindices() {
 
     rm -f $ARCHLIST
     log "Done!"
+    set -o pipefail
 }
 
 function mkchecksums() {
@@ -571,13 +556,6 @@ function process_unchecked() {
     sync_debbugs
 }
 
-# do a run of newstage only before dinstall is on.
-function newstage() {
-    log "Processing the newstage queue"
-    UNCHECKED_WITHOUT_LOCK="-p"
-    do_newstage
-}
-
 # Function to update a "statefile" telling people what we are doing
 # (more or less).
 #