make dak generate-filelist the default

* replaces functions write_filelist(s) in msfl

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/config/backports.org/cron.hourly b/config/backports.org/cron.hourly
index 45980065ee1822b7c8c6bdf4ba9b86811c9503ec..b5e0646270f135ece609196817b1adeb369e6ac5 100755 (executable)
--- 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 4d1195a914768042d5a0274a56a1b6df3f4bffb0..71840f5a397e5e8f39c5e4152c3a33437b5c39da 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -249,6 +249,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="filelist"
+    TIME="generate-filelist"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="fingerprints"
     TIME="import-keyring"

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index a78c2c8db6547439535a1d7d3ea70d0cbe4367a4..57c67c791984f8335a3a2f8309fd48265a7c5147 100644 (file)
--- 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 349a4ae09115f4530e31ae3af0338be8f47696ef..8c13100998eb6b651d86358e720e654eb73dbc8d 100755 (executable)
--- 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 f8706ed9b98e70ef5eacf5ddd0d7d14954c6eb94..23b765f6fb680498fd75c73110ae8ddc37eebdb7 100755 (executable)
--- 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()))