Add source-contains-waf-binary lintian tag to nonfatal list

[dak.git] / dak / new_security_install.py

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 2048e215ea3da3ef0db43d0136171dbf8c0561ab..65df7b08fc2691df1b4b59e5031ff197ae06e719 100755 (executable)
--- 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)"
@@ -155,7 +156,7 @@ def main():
         Options["Sudo"] = ""
 
     if not Options["Sudo"] and not Options["No-Action"]:
-        Logger = daklog.Logger(cnf.Cnf, "security-install")
+        Logger = daklog.Logger("security-install")
 
     session = DBConn().session()