security no longer uses apt-ftparchive but also generate-packages-sources2

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

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index f33a732cb574c75f69a056fd4c142a29d2def057..abe3c08a946e3460d1fe3382b573526153ea5b08 100755 (executable)
--- 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 2dd2820f2b8fee4d715fec1e703eb9d1f0ea9600..af5268bb9891336dc0cd34a4d1c13ff7948fb2d7 100755 (executable)
--- 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)"