From: Jason Self <j@jxself.org>
Date: Sun, 4 Sep 2022 21:32:46 +0000 (-0700)
Subject: build-metapackages.sh: Try GPG twice
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=25e3a4d3c0d17bba5ca3c51949d4a29b23e31ecc;p=kernel-tools.git

build-metapackages.sh: Try GPG twice

This is a workaround for GPG returning a non-zero exit status when
importing lxo's key, due to signatures being missing, even though the
key is actually imported.
---

diff --git a/metapackages/build-metapackages.sh b/metapackages/build-metapackages.sh
index e2a0078..e0e9dfa 100755
--- a/metapackages/build-metapackages.sh
+++ b/metapackages/build-metapackages.sh
@@ -17,8 +17,7 @@ do
     :
     for keyfile in keys/*.asc
     do
-        rm -f $package/usr/share/keyrings/$package.gpg
-        gpg --verbose --no-default-keyring --keyring $package/usr/share/keyrings/$package.gpg --import $keyfile || true
+        gpg --verbose --no-default-keyring --keyring $package/usr/share/keyrings/$package.gpg --import $keyfile || gpg --no-default-keyring --keyring $package/usr/share/keyrings/$package.gpg --import $keyfile
     done
     dpkg-deb --root-owner-group -b $package
 done
\ No newline at end of file