X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=944a46e6a0b1e5811387058e3b90743bed82a1c5;hb=1e3c89e293b45c4258973f26e3bc0878a3356b4a;hp=7377f23b5b7236382e67d002005e71ac0932d800;hpb=0728f1b55afc80016fe27fada8dc78e635d26c60;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index 7377f23b..944a46e6 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -335,10 +335,14 @@ def main ():
     carbon_copy = []
     for copy_to in utils.split_args(Options.get("Carbon-Copy")):
         if copy_to.isdigit():
-            carbon_copy.append(copy_to + "@" + cnf["Dinstall::BugServer"])
+            if cnf.has_key("Dinstall::BugServer"):
+                carbon_copy.append(copy_to + "@" + cnf["Dinstall::BugServer"])
+            else:
+                utils.fubar("Asked to send mail to #%s in BTS but Dinstall::BugServer is not configured" % copy_to)
         elif copy_to == 'package':
             for package in arguments:
-                carbon_copy.append(package + "@" + cnf["Dinstall::PackagesServer"])
+                if cnf.has_key("Dinstall::PackagesServer"):
+                    carbon_copy.append(package + "@" + cnf["Dinstall::PackagesServer"])
                 if cnf.has_key("Dinstall::TrackingServer"):
                     carbon_copy.append(package + "@" + cnf["Dinstall::TrackingServer"])
         elif '@' in copy_to:
@@ -585,6 +589,19 @@ def main ():
     session.commit()
     print "done."
 
+    # If we don't have a Bug server configured, we're done
+    if not cnf.has_key("Dinstall::BugServer"):
+        if Options["Done"] or Options["Do-Close"]:
+            print "Cannot send mail to BugServer as Dinstall::BugServer is not configured"
+
+        logfile.write("=========================================================================\n")
+        logfile.close()
+
+        logfile822.write("\n")
+        logfile822.close()
+
+        return
+
     # read common subst variables for all bug closure mails
     Subst_common = {}
     Subst_common["__RM_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"]
@@ -613,10 +630,17 @@ def main ():
         summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (summary, Options["Reason"])
         summarymail += "----------------------------------------------\n"
         Subst_close_rm["__SUMMARY__"] = summarymail
+
         whereami = utils.where_am_i()
-        Archive = cnf.SubTree("Archive::%s" % (whereami))
-        Subst_close_rm["__MASTER_ARCHIVE__"] = Archive["OriginServer"]
-        Subst_close_rm["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"]
+        Archive = get_archive(whereami, session)
+        if Archive is None:
+            utils.warn("Cannot find archive %s.  Setting blank values for origin" % whereami)
+            Subst_close_rm["__MASTER_ARCHIVE__"] = ""
+            Subst_close_rm["__PRIMARY_MIRROR__"] = ""
+        else:
+            Subst_close_rm["__MASTER_ARCHIVE__"] = Archive.origin_server
+            Subst_close_rm["__PRIMARY_MIRROR__"] = Archive.primary_mirror
+
         for bug in utils.split_args(Options["Done"]):
             Subst_close_rm["__BUG_NUMBER__"] = bug
             if Options["Do-Close"]: