From d201f544a274c611c1c0e8f0b061f0d46d34a7e3 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sat, 3 Dec 2011 18:42:59 +0100 Subject: [PATCH] security no longer uses apt-ftparchive but also generate-packages-sources2 Signed-off-by: Joerg Jaspert --- config/debian-security/cron.daily | 4 ++-- dak/new_security_install.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily index f33a732c..abe3c08a 100755 --- a/config/debian-security/cron.daily +++ b/config/debian-security/cron.daily @@ -78,7 +78,7 @@ while read dumpname; do bzip2 -9fv "$dumpname" done -apt-ftparchive -q clean apt.conf -apt-ftparchive -q clean apt.conf.buildd +#apt-ftparchive -q clean apt.conf +#apt-ftparchive -q clean apt.conf.buildd ################################################################################ diff --git a/dak/new_security_install.py b/dak/new_security_install.py index 2dd2820f..af5268bb 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -102,11 +102,12 @@ def _do_Approve(): # 4. Run all the steps that are needed to publish the changed archive print "Domination" spawn("dak dominate") - print "Generating filelist for apt-ftparchive" - spawn("dak generate-filelist") +# print "Generating filelist for apt-ftparchive" +# spawn("dak generate-filelist") print "Updating Packages and Sources files... This may take a while, be patient" spawn("/srv/security-master.debian.org/dak/config/debian-security/map.sh") - spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file())) +# spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file())) + spawn("dak generate-packages-sources2") print "Updating Release files..." spawn("dak generate-releases") print "Triggering security mirrors... (this may take a while)" -- 2.39.5