From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 25 Apr 2008 22:32:54 +0000 (+0200)
Subject: Merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ae463de80238d314a5bb2ac1b0344f07f001708f;hp=816480bf1b4bd66e6c07eabf0e5d8851cf3df20e;p=dak.git

Merge
---

diff --git a/daklib/queue.py b/daklib/queue.py
index d5314c97..e2c7396a 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -280,15 +280,15 @@ class Upload:
             Subst["__MAINTAINER_FROM__"] = changes["changedby2047"]
             Subst["__MAINTAINER_TO__"] = "%s, %s" % (changes["changedby2047"],
                                                      changes["maintainer2047"])
-            if "sponsoremail" in changes:
-                Subst["__MAINTAINER_TO__"] += ", %s"%changes["sponsoremail"]
             Subst["__MAINTAINER__"] = changes.get("changed-by", "Unknown")
         else:
             Subst["__MAINTAINER_FROM__"] = changes["maintainer2047"]
             Subst["__MAINTAINER_TO__"] = changes["maintainer2047"]
-            if "sponsoremail" in changes:
-                Subst["__MAINTAINER_TO__"] += ", %s"%changes["sponsoremail"]
             Subst["__MAINTAINER__"] = changes.get("maintainer", "Unknown")
+
+        if "sponsoremail" in changes:
+            Subst["__MAINTAINER_TO__"] += ", %s"%changes["sponsoremail"]
+
         if self.Cnf.has_key("Dinstall::TrackingServer") and changes.has_key("source"):
             Subst["__MAINTAINER_TO__"] += "\nBcc: %s@%s" % (changes["source"], self.Cnf["Dinstall::TrackingServer"])