CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unnecesary parameter to gpg

Browse source
This commit is contained in:
Ruben Rodriguez 2019-11-01 15:23:50 -04:00
parent a649fddd6e
commit ed0a7c0439
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
helpers/config
View file

@ -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 apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
# Verify it first # Verify it first
if grep -q "BEGIN PGP SIGNATURE" *.dsc; then 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) [ -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 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 touch ${LOCAL_APT}/keyring.gpg
gpg2 --no-use-agent --keyring ${LOCAL_APT}/keyring.gpg --import ${LOCAL_APT}/etc/trusted.gpg gpg2 --keyring ${LOCAL_APT}/keyring.gpg --import ${LOCAL_APT}/etc/trusted.gpg
gpg2 --no-use-agent --verify --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc gpg2 --verify --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc
[ -n SCHROOT_COMMAND ] && gpgconf --kill gpg-agent [ -n SCHROOT_COMMAND ] && gpgconf --kill gpg-agent
else else
echo WARNING! The dsc file is not gpg signed! echo WARNING! The dsc file is not gpg signed!