merge ftpmaster branch

[dak.git] / dak / reject_proposed_updates.py

diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py
old mode 100755 (executable)
new mode 100644 (file)
index 5d43494..d04dbeb
--- a/dak/reject_proposed_updates.py
+++ b/dak/reject_proposed_updates.py
@@ -23,7 +23,7 @@ import os, pg, sys
 import apt_pkg
 import daklib.database
 import daklib.logging
-import daklib.queue 
+import daklib.queue
 import daklib.utils
 
 ################################################################################
@@ -56,24 +56,24 @@ 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:
         daklib.utils.fubar("need at least one .changes filename as an argument.")
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    database.init(Cnf, projectB)
+    daklib.database.init(Cnf, projectB)
 
     Upload = daklib.queue.Upload(Cnf)
     Logger = Upload.Logger = daklib.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 +82,7 @@ def main():
     for arg in arguments:
         arg = daklib.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()
@@ -159,7 +159,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
@@ -177,7 +177,7 @@ def reject (reject_message = ""):
     os.close(reject_fd)
 
     # Remove the packages from proposed-updates
-    suite_id = database.get_suite_id('proposed-updates')
+    suite_id = daklib.database.get_suite_id('proposed-updates')
 
     projectB.query("BEGIN WORK")
     # Remove files from proposed-updates suite