From 776c1d2af76d7ff487837bdc9e1d23b7b0c1f79b Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Fri, 26 Apr 2019 21:03:56 -0400
Subject: [PATCH] Make signing key management backwards-compatible

---
 helpers/config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helpers/config b/helpers/config
index cd360f2..adc96d2 100755
--- a/helpers/config
+++ b/helpers/config
@@ -129,7 +129,8 @@ if [ "1$SIGNKEY" != "1" ] ; then
   gpgv --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc
 else
   if grep -q "BEGIN PGP SIGNATURE" *.dsc; then
-    KEY=$(gpgv --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc 2>&1 | grep "RSA key" | sed 's/.*RSA key //' || true)
+    KEY=$(gpgv --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc 2>&1 | grep "key ID" | sed 's/.*key ID //' || true)
+    [ $KEY -z ] && KEY=$(gpgv --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc 2>&1 | grep "RSA key" | sed 's/.*RSA key //' || true)
     apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --recv-keys --keyserver keyserver.ubuntu.com $KEY > /dev/null
     gpgv --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc
   else