Merge remote-tracking branch 'ansgar/rm' into merge

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index a44ad6d2793246364d4e90b5d867b78cccd36e18..82f3d9b9d9e971dea3783aa782f6f8fd843171db 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1657,6 +1657,7 @@ class Upload(object):
                     self.rejects.append("%s: deb contents timestamp check failed [%s: %s]" % (filename, sys.exc_type, sys.exc_value))
 
     def check_if_upload_is_sponsored(self, uid_email, uid_name):
+        uid_email = '@'.join(uid_email.split('@')[:2])
         if uid_email in [self.pkg.changes["maintaineremail"], self.pkg.changes["changedbyemail"]]:
             sponsored = False
         elif uid_name in [self.pkg.changes["maintainername"], self.pkg.changes["changedbyname"]]:
@@ -1665,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