X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=65df7b08fc2691df1b4b59e5031ff197ae06e719;hb=3b42439cf9633e63c18553d9c8c1efd1f0aa7174;hp=2dd2820f2b8fee4d715fec1e703eb9d1f0ea9600;hpb=0730e39dd59f8b699d5a2af9b4ca5aad66f0693b;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 2dd2820f..65df7b08 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -87,8 +87,8 @@ 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 embargo")
-    spawn("dak process-policy disembargo")
+    spawn("dak process-policy embargoed")
+    spawn("dak process-policy unembargoed")
     newstage=get_policy_queue('newstage')
 
     # 2. sync the stuff to ftpmaster
@@ -102,11 +102,12 @@ def _do_Approve():
     # 4. 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 "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("apt-ftparchive generate %s" % (utils.which_apt_conf_file()))
+    spawn("dak generate-packages-sources2")
     print "Updating Release files..."
     spawn("dak generate-releases")
     print "Triggering security mirrors... (this may take a while)"