X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=c5e6ca74c7b8103efa7c342adacdbcdf291c5035;hb=6d03dbb954cd67e522374c12225aa08a129e5d60;hp=64ef0f24ccde16d9ba4d29c3329ea6f3e06bdce6;hpb=a287ff6ce704c0c13c37d006ea526b588208ffa3;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index 64ef0f24..c5e6ca74 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -337,7 +337,7 @@ class Upload(object):
         if self.pkg.changes.has_key('fingerprint'):
             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):
+            if fpr and self.check_if_upload_is_sponsored("%s@debian.org" % fpr.uid.uid, fpr.uid.name):
                 if self.pkg.changes.has_key("sponsoremail"):
                     self.Subst["__MAINTAINER_TO__"] += ", %s" % self.pkg.changes["sponsoremail"]
             session.close()
@@ -353,7 +353,7 @@ class Upload(object):
         self.Subst["__REJECT_MESSAGE__"] = self.package_info()
         self.Subst["__SOURCE__"] = self.pkg.changes.get("source", "Unknown")
         self.Subst["__VERSION__"] = self.pkg.changes.get("version", "Unknown")
-        self.Subst["__SUITE__"] = self.pkg.changes["distribution"].keys()
+        self.Subst["__SUITE__"] = ", ".join(self.pkg.changes["distribution"])
 
     ###########################################################################
     def load_changes(self, filename):