From bfadca322501eae165b1fb525d1a377833630d34 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 18 Jun 2011 23:10:39 +0200
Subject: Correct keyring packages temporary workaround to not fail when
 aptitude is selected (Closes: #630919).

---
 scripts/build/lb_chroot_archives | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 14423669d..5c6d690f1 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -497,13 +497,13 @@ EOF
 			# Installing keyring packages
 			if [ -n "${LB_KEYRING_PACKAGES}" ]
 			then
-				# Temporary hack (FIXME)
 				if [ "${LB_DERIVATIVE}" = "true" ]
 				then
-					_APT="--force-yes"
+					# Temporary hack (FIXME)
+					Chroot "apt-get ${APT_OPTIONS} --force-yes install ${LB_KEYRING_PACKAGES}"
+				else
+					Apt chroot "install ${LB_KEYRING_PACKAGES}"
 				fi
-
-				Apt chroot "--force-yes install ${LB_KEYRING_PACKAGES}"
 			fi
 
 			rm -rf chroot/var/cache/apt/*.bin
-- 
cgit v1.2.3