Merge mainline

[dak.git] / dak / security_install.py

diff --git a/dak/security_install.py b/dak/security_install.py
index 1bb5780f14ac64b1a3813f81637c2eff916cff74..f686404f00cc5c512d6a3ae0b6c4025ec8e7a927 100755 (executable)
--- a/dak/security_install.py
+++ b/dak/security_install.py
@@ -84,9 +84,6 @@ def do_upload(changes_files):
         if changes["architecture"].has_key("amd64"):
             print "Not uploading amd64 part to ftp-master\n"
             continue
-        if changes["distribution"].has_key("oldstable-security"):
-            print "Not uploading oldstable-security changes to ftp-master\n"
-            continue
         # Build the file list for this .changes file
         for file in files.keys():
             poolname = os.path.join(Cnf["Dir::Root"], Cnf["Dir::PoolRoot"],
@@ -114,7 +111,7 @@ def do_upload(changes_files):
             uploads[upload_uri] = []
         uploads[upload_uri].extend(file_list)
         # Update the changes list for the upload uri
-        if not changes.has_key(upload_uri):
+        if not changesfiles.has_key(upload_uri):
             changesfiles[upload_uri] = []
         changesfiles[upload_uri].append(changes_file)
         # Remember the suites and source name/version
@@ -328,6 +325,9 @@ def spawn(command):
 
 
 def main():
+    print "Disabled. See your team@security email, and/or contact aj on OFTC."
+    sys.exit(1)
+
     (advisory_number, changes_files) = init()
 
     if not Options["No-Action"]:
@@ -340,7 +340,7 @@ def main():
 
     os.chdir(Cnf["Dir::Queue::Accepted"])
     print "Installing packages into the archive..."
-    spawn("dak process-accepted -pa %s" % (Cnf["Dir::Dak"], " ".join(changes_files)))
+    spawn("dak process-accepted -pa %s" % (" ".join(changes_files)))
     os.chdir(Cnf["Dir::Dak"])
     print "Updating file lists for apt-ftparchive..."
     spawn("dak make-suite-file-list")