The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3512
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 459fef268003139d782b5ad2416392841c3dfc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 7 Aug 2020 15:09:01 -0400
Subject: [PATCH 1/2] Revert "templates/lxc-download.in: use GPG option
--receive-keys instead of --recv-keys"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 <stgra...@ubuntu.com>
---
templates/lxc-download.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index 4cb21299b4..fbfca32bcc 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
From e14546e377a65c73687ad9fdbb5140fa1de66404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 7 Aug 2020 15:10:22 -0400
Subject: [PATCH 2/2] lxc-download: Fix retry loop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #3511
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
templates/lxc-download.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index fbfca32bcc..278487d22c 100644
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -139,7 +139,6 @@ gpg_setup() {
success=1
break
fi
- break
done
if [ -z "${success}" ]; then
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
