Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / dak / new_security_install.py

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 1e1274264402a432f4162256ebac9917116a6f45..7d4603d5811ebcc21b3dc5b24e9f3a4cb77ba5eb 100755 (executable)
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -86,11 +86,6 @@ def sudo(arg, fn, exit):
 
 def do_Approve(): sudo("A", _do_Approve, True)
 def _do_Approve():
-    # 1. use process-policy to go through the COMMENTS dir
-    spawn("dak process-policy embargoed")
-    spawn("dak process-policy unembargoed")
-    newstage=get_policy_queue('newstage')
-
     print "Locking unchecked"
     lockfile='/srv/security-master.debian.org/lock/unchecked.lock'
     spawn("lockfile -r42 {0}".format(lockfile))
@@ -101,18 +96,11 @@ def _do_Approve():
         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 '{}' +")
-
         # 3. Run all the steps that are needed to publish the changed archive
         print "Domination"
         spawn("dak dominate")
-        #    print "Generating filelist for apt-ftparchive"
-        #    spawn("dak generate-filelist")
         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 -a security")
         print "Updating Release files..."
         spawn("dak generate-releases -a security")