From: Stéphane Graber <stgraber@ubuntu.com>
Date: Fri, 7 Aug 2020 19:09:01 +0000 (-0400)
Subject: Revert "templates/lxc-download.in: use GPG option --receive-keys instead of --recv... 
X-Git-Tag: lxc-5.0.0~371^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=459fef268003139d782b5ad2416392841c3dfc19;p=thirdparty%2Flxc.git

Revert "templates/lxc-download.in: use GPG option --receive-keys instead of --recv-keys"

This reverts commit 409040e702f814a167aed5a0e833f4d5c67fd29d.

Testing of both options show identical behavior but receive-keys does
not exist on older releases, so let's revert this.

Closes #3510

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index 4cb21299b..fbfca32bc 100644
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -135,7 +135,7 @@ gpg_setup() {
   success=
   for _ in $(seq 3); do
     if gpg --keyserver "${DOWNLOAD_KEYSERVER}" ${DOWNLOAD_GPG_PROXY:-} \
-      --receive-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1; then
+      --recv-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1; then
       success=1
       break
     fi