From a3502a40c302510970e1423a9146282e81343da5 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <ansgar@debian.org>
Date: Sun, 4 Nov 2012 13:53:49 +0100
Subject: [PATCH] dak/new_security_install.py: Update for multiarchive changes.

newstage is gone. Instead we need to run process-policy and grab
accepted files from $queuedir/accepted.
---
 config/debian-security/dak.conf |  5 +++++
 dak/new_security_install.py     | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index bcf82ece..b5780e04 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -32,6 +32,11 @@ Process-New
   LockDir "/srv/security-master.debian.org/lock/new/";
 };
 
+Process-Policy
+{
+  CopyDir "/srv/security-master.debian.org/queue/accepted";
+};
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 866184b4..1e127426 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -96,16 +96,16 @@ def _do_Approve():
     spawn("lockfile -r42 {0}".format(lockfile))
 
     try:
+        # 1. Install accepted packages
+        print "Installing accepted packages into security archive"
+        for queue in ("embargoed",):
+            spawn("dak process-policy {0}".format(queue))
 
         # 2. sync the stuff to ftpmaster
         print "Sync stuff for upload to ftpmaster"
-        spawn("rsync -a -q %s/. /srv/queued/ftpmaster/." % (newstage.path))
+        spawn("find /srv/security-master.debian.org/queue/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' +")
 
-        # 3. Now run process-upload in the newstage dir
-        print "Now put it into the security archive"
-        spawn("dak process-upload -a -d %s" % (newstage.path))
-
-        # 4. Run all the steps that are needed to publish the changed archive
+        # 3. Run all the steps that are needed to publish the changed archive
         print "Domination"
         spawn("dak dominate")
         #    print "Generating filelist for apt-ftparchive"
@@ -113,9 +113,9 @@ def _do_Approve():
         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("dak generate-packages-sources2")
+        spawn("dak generate-packages-sources2 -a security")
         print "Updating Release files..."
-        spawn("dak generate-releases")
+        spawn("dak generate-releases -a security")
         print "Triggering security mirrors... (this may take a while)"
         spawn("/srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh")
         spawn("sudo -u archvsync -H /home/archvsync/signal_security")
-- 
2.39.5