Do not send mails to packages.qa.debian.org anymore (Closes: #884930)

Signed-off-by: NLuca Falavigna <dktrkranz@debian.org>

config/debian/dak.conf

@@ -12,7 +12,6 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   TrackingServer "packages.qa.debian.org";
    Bcc "archive@ftp-master.debian.org";
    SkipTime 300;
    BXANotify "true";

dak/rm.py

@@ -195,11 +195,9 @@ def main ():
             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:
+            for package in set(arguments):
                 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:
             carbon_copy.append(copy_to)
         else:

daklib/announce.py

@@ -132,7 +132,7 @@ def announce_accept(upload):
     send_mail(message, whitelists=whitelists)
 
     if accepted_to_real_suite and upload.sourceful:
-        # senf mail to announce lists and tracking server
+        # senf mail to announce lists and packages server
         announce = set()
         for suite in upload.suites:
             if suite.policy_queue is None or suite in upload.from_policy_suites:
@@ -140,9 +140,9 @@ def announce_accept(upload):
 
         announce_list_address = ", ".join(announce)
 
-        tracking = cnf.get('Dinstall::TrackingServer')
-        if tracking:
-            announce_list_address = "{0}\nBcc: {1}@{2}".format(announce_list_address, upload.source, tracking)
+        packages = cnf.get('Dinstall::PackagesServer')
+        if packages:
+            announce_list_address = "{0}\nBcc: {1}@{2}".format(announce_list_address, upload.source, packages)
 
         if len(announce_list_address) != 0:
             my_subst = subst.copy()

daklib/queue.py

@@ -252,8 +252,8 @@ class Upload(object):
                     self.Subst["__MAINTAINER_TO__"] += ", %s" % self.pkg.changes["sponsoremail"]
             session.close()
 
-        if cnf.has_key("Dinstall::TrackingServer") and self.pkg.changes.has_key("source"):
-            self.Subst["__MAINTAINER_TO__"] += "\nBcc: %s@%s" % (self.pkg.changes["source"], cnf["Dinstall::TrackingServer"])
+        if cnf.has_key("Dinstall::PackagesServer") and self.pkg.changes.has_key("source"):
+            self.Subst["__MAINTAINER_TO__"] += "\nBcc: %s@%s" % (self.pkg.changes["source"], cnf["Dinstall::PackagesServer"])
 
         # Apply any global override of the Maintainer field
         if cnf.get("Dinstall::OverrideMaintainer"):
@@ -342,9 +342,9 @@ class Upload(object):
             if action:
                 self.update_subst()
                 self.Subst["__ANNOUNCE_LIST_ADDRESS__"] = announce_list
-                if cnf.get("Dinstall::TrackingServer") and \
+                if cnf.get("Dinstall::PackagesServer") and \
                    self.pkg.changes["architecture"].has_key("source"):
-                    trackingsendto = "Bcc: %s@%s" % (self.pkg.changes["source"], cnf["Dinstall::TrackingServer"])
+                    trackingsendto = "Bcc: %s@%s" % (self.pkg.changes["source"], cnf["Dinstall::PackagesServer"])
                     self.Subst["__ANNOUNCE_LIST_ADDRESS__"] += "\n" + trackingsendto
 
                 mail_message = utils.TemplateSubst(self.Subst, announcetemplate)

docs/README.config

@@ -93,11 +93,6 @@ Dinstall
     //// carbon-copying a bug close mail to a package maintainer.
     // PackagesServer "packages.example.org";
 
-    //// TrackingServer (optional): used by 'dak process-upload' and 'dak
-    //// rm' to send messages for the maintainer also to an alias for people
-    //// tracking a specific source package.
-    // TrackingServer "packages.qa.example.org";
-
     //// All sent mail is blind carbon copied to the email address in Bcc if it's
     //// not blank.
     // Bcc "archive@example.org";