From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 12 Aug 2012 16:28:45 +0000 (+0200)
Subject: dinstall function changes
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b3f1dc8e26bd20e73cef61f481679b7544e8745c;p=dak.git

dinstall function changes

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

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index e9f8bfd3..abc5bd97 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -147,7 +147,7 @@ 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() {
@@ -557,13 +557,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).
 #