[lxc-devel] [distrobuilder/master] gpg: Re-try key download

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 363 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190421/81ab0238/attachment.bin>
-------------- next part --------------
From b841a17fa66e9f15153e102bd71b514d536bde2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 21 Apr 2019 11:42:39 -0400
Subject: [PATCH] gpg: Re-try key download
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 shared/util.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/util.go b/shared/util.go
index becc072..2e0af1e 100644
--- a/shared/util.go
+++ b/shared/util.go
@@ -143,7 +143,7 @@ func CreateGPGKeyring(keyserver string, keys []string) (string, error) {
 
 	args = append(args, append([]string{"--recv-keys"}, keys...)...)
 
-	out, err := lxd.RunCommand("gpg", args...)
+	out, err := lxd.TryRunCommand("gpg", args...)
 	if err != nil {
 		os.RemoveAll(gpgDir)
 		return "", fmt.Errorf("Failed to create keyring: %s", out)