From 36c1b1a3ac2f74a06a9ec28ea49a8e019f88eaad Mon Sep 17 00:00:00 2001 From: Paride Legovini Date: Fri, 28 Nov 2025 10:28:34 +0100 Subject: [PATCH] email policy: do not crash if person is missing from keyserver Thanks: Julian Andres Klode --- britney2/policies/email.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/britney2/policies/email.py b/britney2/policies/email.py index 55424f3..6962674 100644 --- a/britney2/policies/email.py +++ b/britney2/policies/email.py @@ -158,11 +158,17 @@ class EmailPolicy(BasePolicy, Rest): return None return address except HTTPError as e: - if e.code != 410: # suspended user + if e.code == 404: # missing user + self.logger.warning( + "Person %s missing from Ubuntu keyserver" % person + ) + elif e.code == 410: # suspended user + self.logger.info( + "Ignoring person %s as suspended in Launchpad" % person + ) + else: raise - self.logger.info( - "Ignoring person %s as suspended in Launchpad" % person - ) + return None def scrape_gpg_emails(self, people):