[dak/master 2/2] make dak generate-filelist the default

[Torsten Werner <twerner@debian.org>]

* replaces functions write_filelist(s) in msfl

Signed-off-by: Torsten Werner <twerner@debian.org>
---
 config/backports.org/cron.hourly |    1 +
 config/debian/cron.dinstall      |    8 ++++++++
 config/debian/dinstall.functions |    5 +++++
 dak/make_suite_file_list.py      |    4 +++-
 dak/new_security_install.py      |    1 +
 5 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/config/backports.org/cron.hourly b/config/backports.org/cron.hourly
index 4598006..b5e0646 100755
--- a/config/backports.org/cron.hourly
+++ b/config/backports.org/cron.hourly
@@ -53,6 +53,7 @@ symlinks -d -r $ftpdir
 
 cd $masterdir
 dak make-suite-file-list
+dak generate-filelist
 
 # Generate override files
 cd $overridedir
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 4d1195a..71840f5 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -250,6 +250,14 @@ GO=(
 stage $GO
 
 GO=(
+    FUNC="filelist"
+    TIME="generate-filelist"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
     FUNC="fingerprints"
     TIME="import-keyring"
     ARGS=""
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index a78c2c8..57c67c7 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -134,6 +134,11 @@ function msfl() {
     dak make-suite-file-list
 }
 
+function filelist() {
+    log "Generating file lists for apt-ftparchive"
+    dak generate-filelist
+}
+
 function fingerprints() {
     log "Not updating fingerprints - scripts needs checking"
 
diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index 349a4ae..8c13100 100755
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -361,7 +361,9 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id,
                                    suite=suite, filetype = filetype)
     cleanup(packages, session)
     session.commit()
-    write_filelists(packages, dislocated_files, session)
+
+    # has been replaced by 'dak generate-filelist':
+    #write_filelists(packages, dislocated_files, session)
 
 ################################################################################
 
diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index f8706ed..23b765f 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -474,6 +474,7 @@ def _do_Approve():
     # 3. run dak make-suite-file-list / apt-ftparchve / dak generate-releases
     print "Updating file lists for apt-ftparchive..."
     spawn("dak make-suite-file-list")
+    spawn("dak generate-filelist")
     print "Updating Packages and Sources files..."
     spawn("/org/security.debian.org/dak/config/debian-security/map.sh")
     spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file()))
-- 
1.6.3.3