From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 14 Feb 2009 10:54:56 +0000 (+0100)
Subject: Merge branch 'master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d7e5cbcfa2e1ffdd3ce0008df7e274aabe192922;hp=051c49b04f9f7ec43e064c74f46eb50bbb74f035;p=dak.git

Merge branch 'master' into merge

* master:
  security install
  security_install
---

diff --git a/config/debian-security/map.sh b/config/debian-security/map.sh
new file mode 100755
index 00000000..d0cbaf44
--- /dev/null
+++ b/config/debian-security/map.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+dak make-pkg-file-mapping | bzip2 -9 > /org/security.debian.org/ftp/indices/package-file.map.bz2
diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index b1a47dba..c72641a2 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -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")