Merge branch 'master' into bpo

* master:
  daklib/queue.py: check if sponsoremail is set first

diff --git a/daklib/queue.py b/daklib/queue.py
index d89284a3f17b4754fc5fd8c5d725d1f44d24962a..7ec5f094457ad65f45b94a6cafed4f7aaf2fb936 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -338,7 +338,8 @@ class Upload(object):
             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"]
+                if self.pkg.changes.has_key("sponsoremail"):
+                    self.Subst["__MAINTAINER_TO__"] += ", %s" % self.pkg.changes["sponsoremail"]
             session.close()
 
         if cnf.has_key("Dinstall::TrackingServer") and self.pkg.changes.has_key("source"):