[SCM] live-build branch, debian-next, updated. debian/3.0_a21-1-18-gbfadca3

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit bfadca322501eae165b1fb525d1a377833630d34
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 18 23:10:39 2011 +0200

    Correct keyring packages temporary workaround to not fail when aptitude is selected (Closes: #630919).

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 1442366..5c6d690 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

-- 
live-build