Merge ~ubuntu-release/britney/+git/britney2-ubuntu:less-recipients2 into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Brian Murray]

I was reading britney logs (fun!) and saw the following failure to send an email:

I: [2024-07-10T05:49:41+0000] - python-django-crispy-forms-foundation/1.0.2+ds-1 stuck for 135 days (email last sent at 0 days old, threshold for sending 125 days), emailing
E: [2024-07-10T05:49:41+0000] - Failed to send mail! Is SMTP server running?
E: [2024-07-10T05:49:41+0000] - {'': (501, b'5.1.3 Bad recipient address syntax')}

Looking into it that package was uploaded by "~team+python" which has no gpg keys (https://api.launchpad.net/1.0/~team+python/gpg_keys) so we shouldn't continue trying to find an email address for that user.

Additionally, this stops returning a couple of variables if they are empty.

[Steve Langasek (vorlon)]

review: Needs Information

248df06... by Brian Murray on 2024-07-10

Revert "policies/email.py: if there are no gpg entries don't continue"

This reverts commit bc49b74ab765182b27e2d2c3fd5c7c0ff44cd767.

[Brian Murray (brian-murray)]

It's ready for re-review.

[Steve Langasek (vorlon)]

review: Needs Fixing

61e3230... by Brian Murray on 2024-07-12

policies/email.py drop unused import

diff --git a/britney2/policies/email.py b/britney2/policies/email.py
index 349bf91..d62cb60 100644
--- a/britney2/policies/email.py
+++ b/britney2/policies/email.py
@@ -154,6 +154,8 @@ class EmailPolicy(BasePolicy, Rest):
                         if match:
                             addresses.append(match.group(1))
             address = self.addresses[person] = address_chooser(addresses)
+            if not address:
+                return None
             return address
         except HTTPError as e:
             if e.code != 410:  # suspended user
@@ -166,6 +168,8 @@ class EmailPolicy(BasePolicy, Rest):
     def scrape_gpg_emails(self, people):
         """Find email addresses from GPG keys."""
         emails = [self._scrape_gpg_emails(person) for person in (people or [])]
+        if not emails:
+            return
         return [email for email in emails if email is not None]
 
     def lp_get_emails(self, pkg, version):