Fix crasher on unsigned FETCH_HEAD

If the FETCH_HEAD is not signed, then keyid is going to be None. Don't
attempt to look up UIDs in such situations.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

1 files changed, 13 insertions, 12 deletions

diff --git a/b4/pr.py b/b4/pr.py
index 86d039c..d8ff7f4 100644
--- a/b4/pr.py
+++ b/b4/pr.py
@@ -141,18 +141,19 @@ def attest_fetch_head(gitdir, lmsg):
         ecode, out = b4.git_run_command(gitdir, ['verify-commit', '--raw', 'FETCH_HEAD'], logstderr=True)
 
     good, valid, trusted, keyid, sigtime = b4.check_gpg_status(out)
-    try:
-        uids = b4.get_gpg_uids(keyid)
-        signer = None
-        for uid in uids:
-            if uid.find(f'<{lmsg.fromemail}') >= 0:
-                signer = uid
-                break
-        if not signer:
-            signer = uids[0]
-
-    except KeyError:
-        signer = f'{lmsg.fromname} <{lmsg.fromemail}'
+    signer = None
+    if keyid:
+        try:
+            uids = b4.get_gpg_uids(keyid)
+            for uid in uids:
+                if uid.find(f'<{lmsg.fromemail}') >= 0:
+                    signer = uid
+                    break
+            if not signer:
+                signer = uids[0]
+
+        except KeyError:
+            signer = f'{lmsg.fromname} <{lmsg.fromemail}>'
 
     if good and valid:
         passing = True