[SCM] live-build branch, debian-next, updated. debian/3.0_a57-1-13-g6cb824c

Daniel Baumann daniel at debian.org
Mon Aug 27 12:07:39 UTC 2012


The following commit has been merged in the debian-next branch:
commit 6cb824c187d60e86d07514a648ee6dec10f47714
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 27 14:07:34 2012 +0200

    Improving check for missing apt-ftparchive to check for the actual file, rather than to check for a possible missleading bootstrap flavour.

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 3281a0c..1d0bee9 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -340,9 +340,9 @@ EOF
 			if Find_files chroot/root/packages/*.deb
 			then
 				# If we bootstrapped a minimal chroot, we need
-				# to install apt-utils before we have have
+				# to install apt-utils before we have
 				# completed all the indices.
-				if [ "${LB_BOOTSTRAP_FLAVOUR}" != "standard" ]
+				if [ ! -e chroot/usr/bin/apt-ftparchive ]
 				then
 					Apt chroot update
 				fi

-- 
live-build



More information about the debian-live-changes mailing list