commit:     fa0e059df00b2b6c4abcb80876f5d159ebefd2a3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 16:41:49 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 16:41:49 2025 +0000
URL:        https://gitweb.gentoo.org/proj/gemato.git/commit/?id=fa0e059d

openpgp: Raise an exception of importing yields no keys

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 gemato/openpgp.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gemato/openpgp.py b/gemato/openpgp.py
index f148765..39c1370 100644
--- a/gemato/openpgp.py
+++ b/gemato/openpgp.py
@@ -545,13 +545,15 @@ debug-level guru
             keyfile.read(),
             raise_on_error=OpenPGPKeyImportError)
 
+        fprs = set()
+        for line in out.splitlines():
+            if line.startswith(b'[GNUPG:] IMPORT_OK'):
+                fprs.add(line.split(b' ')[3].decode('ASCII'))
+        if not fprs:
+            raise OpenPGPKeyImportError("No keys imported")
+
         if trust:
-            fprs = set()
-            for line in out.splitlines():
-                if line.startswith(b'[GNUPG:] IMPORT_OK'):
-                    fprs.add(line.split(b' ')[3].decode('ASCII'))
             self._trusted_keys.update(fprs)
-
             ownertrust = ''.join(f'{fpr}:6:\n' for fpr in fprs).encode('utf8')
             exitst, out, err = self._spawn_gpg(
                 [GNUPG, '--batch', '--import-ownertrust'],

Reply via email to