X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=d674befd4f6a639f5f35d62bacf32a691687f650;hb=1e1457bde3318c6605b4c97d4299803fdaf8e774;hp=98951d416c4d8020189e7ca82c3edf8219ff8aaa;hpb=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 98951d41..d674befd 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Wrapper for Debian Security team
+""" Wrapper for Debian Security team """
 # Copyright (C) 2006  Anthony Towns <ajt@debian.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -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,6 +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("/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")