X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=be3c65161e8fee8c203f6954715ec50fa9445d3f;hb=5aff27bd1fc145acd9f2459cc128f88033a4130e;hp=31c22cbb63ca222b32ef709fd0dcee0481ca4165;hpb=09a1a20566dcf84ca229b4339bd8f8080eb59afd;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index 31c22cbb..be3c6516 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1396,7 +1396,14 @@ def gpg_get_key_addresses(fingerprint):
     if result == 0:
         for l in output.split('\n'):
             m = re_gpg_uid.match(l)
-            if m:
+            if not m:
+                continue
+            address = m.group(1)
+            if address.endswith('@debian.org'):
+                # prefer @debian.org addresses
+                # TODO: maybe not hardcode the domain
+                addresses.insert(0, address)
+            else:
                 addresses.append(m.group(1))
     key_uid_email_cache[fingerprint] = addresses
     return addresses