Check whether GPG key has a @debian.org uid, and use it

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

diff --git a/daklib/queue.py b/daklib/queue.py
index 4e7a5e95531316dd8b76348f97435e631b237196..82f3d9b9d9e971dea3783aa782f6f8fd843171db 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1666,8 +1666,12 @@ class Upload(object):
                 sponsored = True
         else:
             sponsored = True
+            sponsor_addresses = utils.gpg_get_key_addresses(self.pkg.changes["fingerprint"])
+            debian_emails = filter(lambda addr: addr.endswith('@debian.org'), sponsor_addresses)
+            if uid_email not in debian_emails:
+                if debian_emails:
+                    uid_email = debian_emails[0]
             if ("source" in self.pkg.changes["architecture"] and uid_email and utils.is_email_alias(uid_email)):
-                sponsor_addresses = utils.gpg_get_key_addresses(self.pkg.changes["fingerprint"])
                 if (self.pkg.changes["maintaineremail"] not in sponsor_addresses and
                     self.pkg.changes["changedbyemail"] not in sponsor_addresses):
                         self.pkg.changes["sponsoremail"] = uid_email