X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=1e1274264402a432f4162256ebac9917116a6f45;hb=a3502a40c302510970e1423a9146282e81343da5;hp=fb2d5ccff58e40b90486301e29868722569011a0;hpb=ebec9bc1c451491b8558e6012680e7d37c0bc595;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index fb2d5ccf..1e127426 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -91,20 +91,21 @@ def _do_Approve():
     spawn("dak process-policy unembargoed")
     newstage=get_policy_queue('newstage')
 
-    # 2. sync the stuff to ftpmaster
-    print "Sync stuff for upload to ftpmaster"
-    spawn("rsync -a -q %s/. /srv/queued/ftpmaster/." % (newstage.path))
-
     print "Locking unchecked"
     lockfile='/srv/security-master.debian.org/lock/unchecked.lock'
-    spawn("lockfile -r8 {0}".format(lockfile))
+    spawn("lockfile -r42 {0}".format(lockfile))
 
     try:
-        # 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))
+        # 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("find /srv/security-master.debian.org/queue/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' +")
 
-        # 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"
@@ -112,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")
@@ -142,9 +143,9 @@ def main():
         if not cnf.has_key("Security::Options::%s" % (i)):
             cnf["Security::Options::%s" % (i)] = ""
 
-    changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    changes_files = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
 
-    Options = cnf.SubTree("Security::Options")
+    Options = cnf.subtree("Security::Options")
     if Options['Help']:
         usage()
 
@@ -188,9 +189,11 @@ def main():
         acceptfilename="%s/COMMENTS/ACCEPT.%s_%s" % (os.path.dirname(os.path.abspath(changes[0])), dbchange.source, version)
         acceptfiles[acceptfilename]=1
 
+    print "Would create %s now and then go on to accept this package, if you allow me to." % (acceptfiles.keys())
     if Options["No-Action"]:
-        print "Would create %s now and then go on to accept this package, but No-Action is set" % (acceptfiles.keys())
         sys.exit(0)
+    else:
+        raw_input("Press Enter to continue")
 
     for acceptfilename in acceptfiles.keys():
         accept_file = file(acceptfilename, "w")