Merge X-Katie restoration.

[dak.git] / dak / reject_proposed_updates.py

diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py
index 5d43494872ed85e01037a3dd6f3f2044fd0a959d..d78fe598e4e181795cfedde13aa7ddac04e27efb 100755 (executable)
--- a/dak/reject_proposed_updates.py
+++ b/dak/reject_proposed_updates.py
@@ -68,12 +68,12 @@ def main():
         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:
@@ -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