From 4259fcac5d3b3650cfa66f50b52413f0b9ec2182 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 19 Feb 2013 12:01:27 +0100
Subject: [PATCH] Harmonize handling of pre-existing gnupg dotfiles in chroot
 when handling fake signing keys for local repository.

---
 scripts/build/chroot_archives | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 06e16fb78..6e464ec4d 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -366,13 +366,12 @@ EOF
 
 				if [ "${LB_APT_SECURE}" = "true" ]
 				then
-					_LB_DOTGNUPG_EXISTED=0
-					if [ -d chroot/root/.gnupg ]
+					if [ -e chroot/root/.gnupg ]
 					then
-						_LB_DOTGNUPG_EXISTED=1
+						mv chroot/root/.gnupg chroot/root/.gnupg.orig
 					fi
 
-					# Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
+					# Ensure ~/.gnupg exists
 					mkdir -p chroot/root/.gnupg
 
 					# Temporarily replace /dev/random with /dev/urandom so as not
@@ -436,10 +435,11 @@ EOF
 						mv chroot/dev/random.orig chroot/dev/random
 					fi
 
-					# Remove /root/.gnupg if we created it during the signing process
-					if [ "${_LB_DOTGNUPG_EXISTED}" -eq 0 ]
+					rm -rf chroot/root/.gnupg
+
+					if [ -e chroot/root/.gnupg.orig ]
 					then
-						rm -rf chroot/root/.gnupg
+						mv chroot/root/.gnupg.orig chroot/root/.gnupg
 					fi
 				fi