[dak/master] security no longer uses apt-ftparchive but also generate-packages-sources2

[Joerg Jaspert <joerg@debian.org>]

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 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 f33a732..abe3c08 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 2dd2820..af5268b 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)"
-- 
1.7.2.5