From 95a941759ce8b034417617a4211f5a4c81070e4a Mon Sep 17 00:00:00 2001
From: William King <william.king@quentustech.com>
Date: Mon, 15 Jun 2015 15:17:18 -0700
Subject: [PATCH] FS-7338 fix when the build system was deleting the keyring
 before it was fully finished with it.

---
 debian/util.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/util.sh b/debian/util.sh
index 292ac6b8cb..efeb071a3b 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -322,10 +322,6 @@ build_debs () {
           --othermirror "$(get_mirrors $distro $custom_sources_file)"
       fi
     }
-    if [ ! -e "$custom_keyring" ]; then
-      # Cleanup script created temporary file
-      rm -f $keyring
-    fi
     if ! [ -d $cow_img ]; then
       announce "Creating base $distro-$arch image..."
       local x=30
@@ -351,6 +347,10 @@ build_debs () {
       --hookdir "$hookdir" \
       --buildresult ../ \
       $cow_build_opts
+    if [ ! -e "$custom_keyring" ]; then
+      # Cleanup script created temporary file
+      rm -f $keyring
+    fi
   } 1>&2
   echo ${dsc%.dsc}_${arch}.changes
 }