import latest bpo changes before merging its code around

[dak.git] / dak / reject_proposed_updates.py

diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py
index d50923ce0cc29ed534fa9cd000ef1db7c91fa2ed..7770f66ec4bba695e78422f3df4704062d79d8da 100755 (executable)
--- a/dak/reject_proposed_updates.py
+++ b/dak/reject_proposed_updates.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Manually reject packages for proprosed-updates
+""" Manually reject packages for proprosed-updates """
 # Copyright (C) 2001, 2002, 2003, 2004, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -21,10 +21,11 @@
 
 import os, pg, sys
 import apt_pkg
-import dak.lib.database as database
-import dak.lib.logging as logging
-import dak.lib.queue as queue
-import dak.lib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
+from daklib.regexes import re_default_answer
 
 ################################################################################
 
@@ -56,14 +57,14 @@ def main():
                  ('m',"manual-reject","Reject-Proposed-Updates::Options::Manual-Reject", "HasArg"),
                  ('s',"no-mail", "Reject-Proposed-Updates::Options::No-Mail")]
     for i in [ "help", "manual-reject", "no-mail" ]:
-       if not Cnf.has_key("Reject-Proposed-Updates::Options::%s" % (i)):
-           Cnf["Reject-Proposed-Updates::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Reject-Proposed-Updates::Options::%s" % (i)):
+            Cnf["Reject-Proposed-Updates::Options::%s" % (i)] = ""
 
     arguments = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
 
     Options = Cnf.SubTree("Reject-Proposed-Updates::Options")
     if Options["Help"]:
-       usage()
+        usage()
     if not arguments:
         utils.fubar("need at least one .changes filename as an argument.")
 
@@ -73,7 +74,7 @@ def main():
     Upload = queue.Upload(Cnf)
     Logger = Upload.Logger = logging.Logger(Cnf, "reject-proposed-updates")
 
-    bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: this header is obsolete"
+    bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: lauren $Revision: 1.4 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"])
     else:
@@ -82,7 +83,7 @@ def main():
     for arg in arguments:
         arg = utils.validate_changes_file_arg(arg)
         Upload.pkg.changes_file = arg
-       Upload.init_vars()
+        Upload.init_vars()
         cwd = os.getcwd()
         os.chdir(Cnf["Suite::Proposed-Updates::CopyDotDak"])
         Upload.update_vars()
@@ -97,7 +98,7 @@ def main():
 
             while prompt.find(answer) == -1:
                 answer = utils.our_raw_input(prompt)
-                m = queue.re_default_answer.search(prompt)
+                m = re_default_answer.search(prompt)
                 if answer == "":
                     answer = m.group(1)
                 answer = answer[:1].upper()
@@ -123,21 +124,21 @@ def reject (reject_message = ""):
     # If we weren't given a manual rejection message, spawn an editor
     # so the user can add one in...
     if not reject_message:
-        temp_filename = utils.temp_filename()
+        (fd, temp_filename) = utils.temp_filename()
         editor = os.environ.get("EDITOR","vi")
         answer = 'E'
         while answer == 'E':
             os.system("%s %s" % (editor, temp_filename))
-            file = utils.open_file(temp_filename)
-            reject_message = "".join(file.readlines())
-            file.close()
+            f = os.fdopen(fd)
+            reject_message = "".join(f.readlines())
+            f.close()
             print "Reject message:"
             print utils.prefix_multi_line_string(reject_message,"  ", include_blank_lines=1)
             prompt = "[R]eject, Edit, Abandon, Quit ?"
             answer = "XXX"
             while prompt.find(answer) == -1:
                 answer = utils.our_raw_input(prompt)
-                m = queue.re_default_answer.search(prompt)
+                m = re_default_answer.search(prompt)
                 if answer == "":
                     answer = m.group(1)
                 answer = answer[:1].upper()
@@ -159,7 +160,7 @@ def reject (reject_message = ""):
     # If we fail here someone is probably trying to exploit the race
     # so let's just raise an exception ...
     if os.path.exists(reject_filename):
-         os.unlink(reject_filename)
+        os.unlink(reject_filename)
     reject_fd = os.open(reject_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644)
 
     # Build up the rejection email
@@ -168,6 +169,7 @@ def reject (reject_message = ""):
     Upload.Subst["__REJECTOR_ADDRESS__"] = user_email_address
     Upload.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
     Upload.Subst["__STABLE_REJECTOR__"] = Cnf["Reject-Proposed-Updates::StableRejector"]
+    Upload.Subst["__STABLE_MAIL__"] = Cnf["Reject-Proposed-Updates::StableMail"]
     Upload.Subst["__MORE_INFO_URL__"] = Cnf["Reject-Proposed-Updates::MoreInfoURL"]
     Upload.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]
     reject_mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/reject-proposed-updates.rejected")
@@ -181,20 +183,20 @@ def reject (reject_message = ""):
 
     projectB.query("BEGIN WORK")
     # Remove files from proposed-updates suite
-    for file in files.keys():
-        if files[file]["type"] == "dsc":
+    for f in files.keys():
+        if files[f]["type"] == "dsc":
             package = dsc["source"]
-            version = dsc["version"];  # NB: not files[file]["version"], that has no epoch
+            version = dsc["version"];  # NB: not files[f]["version"], that has no epoch
             q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version))
             ql = q.getresult()
             if not ql:
                 utils.fubar("reject: Couldn't find %s_%s in source table." % (package, version))
             source_id = ql[0][0]
             projectB.query("DELETE FROM src_associations WHERE suite = '%s' AND source = '%s'" % (suite_id, source_id))
-        elif files[file]["type"] == "deb":
-            package = files[file]["package"]
-            version = files[file]["version"]
-            architecture = files[file]["architecture"]
+        elif files[f]["type"] == "deb":
+            package = files[f]["package"]
+            version = files[f]["version"]
+            architecture = files[f]["architecture"]
             q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND b.architecture = a.id" % (package, version, architecture))
             ql = q.getresult()