Merge remote branch 'drkranz/master' into merge

* drkranz/master:
  daklib/queue.py: send mails to sponsors too

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/daklib/queue.py b/daklib/queue.py
index 8d814e86c077828c2e7187f3de2e04416cb1d47a..afd3277840ed153b7972eba59191eb19623b04f6 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -329,8 +329,11 @@ class Upload(object):
             self.Subst["__MAINTAINER_TO__"] = self.pkg.changes["maintainer2047"]
             self.Subst["__MAINTAINER__"] = self.pkg.changes.get("maintainer", "Unknown")
 
-        if "sponsoremail" in self.pkg.changes:
+        session = DBConn().session()
+        fpr = get_fingerprint(self.pkg.changes['fingerprint'], session)
+        if self.check_if_upload_is_sponsored("%s@debian.org" % fpr.uid.uid, fpr.uid.name):
             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"])