[SCM] live-build branch, debian, updated. debian/3.0_a34-1-10-gf2132fc

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit cf4f1c8acef06bce4b026e6b7be255fe44401b59
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 30 15:26:34 2011 +0200

    Treating sources.list top-level file specially to workaround bug in apt that makes sources.list.d sources to be never prefered over main sources.list when using pinning (Closes: #573054).

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index a8b3b6a..200b20d 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -431,6 +431,9 @@ EOF
 				# Add to sources.list.d
 				echo "deb file:/root/packages ./" > chroot/etc/apt/sources.list.d/packages.list
 
+				# Move top-level sources away, otherwise apt always preferes it, even for local packages
+				mv chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/zz-sources.list
+
 				# Removing depends
 				Remove_package
 			else
@@ -589,6 +592,9 @@ EOF
 		# Creating lock file
 		Create_lockfile .lock
 
+		# Restore top-level sources
+		mv chroot/etc/apt/sources.list.d/zz-sources.list chroot/etc/apt/sources.list
+
 		# Configure generic indices
 		# Don't do anything if it's not required
 		if [ "${LB_PARENT_MIRROR_CHROOT}" = "${LB_PARENT_MIRROR_BINARY}" ] && \

-- 
live-build