]> git.decadent.org.uk Git - dak.git/commitdiff
One time is enough
authorJoerg Jaspert <joerg@debian.org>
Fri, 25 Apr 2008 22:32:40 +0000 (00:32 +0200)
committerJoerg Jaspert <joerg@debian.org>
Fri, 25 Apr 2008 22:32:40 +0000 (00:32 +0200)
daklib/queue.py

index d5314c97a04bd2ce56ca595369779c4ddcc6c608..e2c7396a3dc91df0417dc98803e27e6e2a58acf2 100755 (executable)
@@ -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"])