From: Torsten Werner Date: Tue, 3 Nov 2009 20:49:41 +0000 (+0100) Subject: make dak generate-filelist the default X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85285dd42f74743aafbbe8bfbaf3579a20ae6548;p=dak make dak generate-filelist the default * replaces functions write_filelist(s) in msfl Signed-off-by: Torsten Werner --- diff --git a/config/backports.org/cron.hourly b/config/backports.org/cron.hourly index 45980065..b5e06462 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 4d1195a9..71840f5a 100755 --- 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 a78c2c8d..57c67c79 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 349a4ae0..8c131009 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 f8706ed9..23b765f6 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()))