From ed0a7c04395510f35e57fa65a1f7c100243fed10 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Fri, 1 Nov 2019 15:23:50 -0400 Subject: [PATCH] Removed unnecesary parameter to gpg --- helpers/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helpers/config b/helpers/config index c502aac4..e4536380 100755 --- a/helpers/config +++ b/helpers/config @@ -135,12 +135,12 @@ apt-get update -c $LOCAL_APT/etc/apt.conf apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf # Verify it first if grep -q "BEGIN PGP SIGNATURE" *.dsc; then - KEY=$(gpg2 --no-use-agent --keyid-format 0xlong --verify *.dsc 2>&1 | grep 0x | sed 's/.*0x//' || true) + KEY=$(gpg2 --keyid-format 0xlong --verify *.dsc 2>&1 | grep 0x | sed 's/.*0x//' || true) [ -z "$KEY" ] && KEY=$(gpgv --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc 2>&1 | egrep ".SA key" | sed 's/.*.SA key //' || true) apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --recv-keys --keyserver hkps://keyserver.ubuntu.com:443 $KEY > /dev/null touch ${LOCAL_APT}/keyring.gpg - gpg2 --no-use-agent --keyring ${LOCAL_APT}/keyring.gpg --import ${LOCAL_APT}/etc/trusted.gpg - gpg2 --no-use-agent --verify --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc + gpg2 --keyring ${LOCAL_APT}/keyring.gpg --import ${LOCAL_APT}/etc/trusted.gpg + gpg2 --verify --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc [ -n SCHROOT_COMMAND ] && gpgconf --kill gpg-agent else echo WARNING! The dsc file is not gpg signed! -- GitLab