X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=d674befd4f6a639f5f35d62bacf32a691687f650;hb=f2292c9a3f742a88bf161a82d14059984f55da5e;hp=12bef381796e5526a8b5873d118ff12f8cc96c84;hpb=6e6022ab339328bb3a867a31c9b1fee58253cae5;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 12bef381..d674befd 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -386,7 +386,7 @@ def generate_advisory(template):
                                        ver, suite)
         adv += "%s\n%s\n\n" % (suite_header, "-"*len(suite_header))
 
-        arches = Cnf.ValueList("Suite::%s::Architectures" % suite)
+        arches = database.get_suite_architectures(suite)
         if "source" in arches:
             arches.remove("source")
         if "all" in arches:
@@ -474,7 +474,7 @@ def _do_Approve():
     print "Updating file lists for apt-ftparchive..."
     spawn("dak make-suite-file-list")
     print "Updating Packages and Sources files..."
-    spawn("dak make-pkg-file-mapping | bzip2 -9 > /org/security.debian.org/ftp/indices/package-file.map.bz2")
+    spawn("/org/security.debian.org/dak/config/debian-security/map.sh")
     spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file()))
     print "Updating Release files..."
     spawn("dak generate-releases")