From 7309674ca7b5606bd6268712a6743de66761bd0d Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 1 Oct 2018 13:04:26 +0200
Subject: bin/build-packages: retrieve keys earlier

---
 bin/build-packages | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'bin/build-packages')

diff --git a/bin/build-packages b/bin/build-packages
index 24951c7..4a727ca 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -725,16 +725,21 @@ while [ "${count}" -ne 0 ] && \
         fi
         echo 'failure' > "${tmp_dir}/.ping-build-master"
         >&2 printf ' failed.\n'
+        # receive missing keys
+        # shellcheck disable=SC2038
+        find . -type f -maxdepth 1 -name '*.build-log' -exec \
+          sed -n '
+            s/^.* FAILED (unknown public key \([0-9A-F]\{16\}\)).*$/0x\1/
+            T
+            p
+          ' {} \; | \
+          xargs -rn1 gpg --recv-keys || \
+          true
       done
 
       if ! ${success}; then
         for log in *'.build-log'; do
           if [ -f "${log}" ]; then
-            sed -n '
-              s/^.* FAILED (unknown public key \([0-9A-F]\{16\}\)).*$/0x\1/
-              T
-              p
-            ' "${log}" | xargs -rn1 gpg --recv-keys
             if ${upload_to_build_master}; then
               gzip "${log}"
             else
-- 
cgit v1.2.3-54-g00ecf