From: Stéphane Graber <stgraber@ubuntu.com>
Date: Tue, 3 Jun 2014 19:11:43 +0000 (-0400)
Subject: lxc-download: Attempt to get the GPG key 3 times
X-Git-Tag: lxc-1.1.0.alpha1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=809a1539a3d83d0ea6f277519e6d43e75ccf1013;p=thirdparty%2Flxc.git

lxc-download: Attempt to get the GPG key 3 times

This is to deal with the GPG pool occasionaly yielding broken servers.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index a06c0a401..31e0d279f 100644
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -116,8 +116,17 @@ gpg_setup() {
     mkdir -p "$DOWNLOAD_TEMP/gpg"
     chmod 700 "$DOWNLOAD_TEMP/gpg"
     export GNUPGHOME="$DOWNLOAD_TEMP/gpg"
-    if ! gpg --keyserver $DOWNLOAD_KEYSERVER \
+
+    success=
+    for i in $(seq 3); do
+        if gpg --keyserver $DOWNLOAD_KEYSERVER \
             --recv-keys ${DOWNLOAD_KEYID} >/dev/null 2>&1; then
+            success=1
+            break
+        fi
+    done
+
+    if [ -z "$success" ]; then
         echo "ERROR: Unable to fetch GPG key from keyserver."
         exit 1
     fi