[SCM] live-build branch, debian-next, updated. debian/3.0_a16-1-8-g400c035

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 400c0355d9ac685f3ae9c316e1d9b958ffbb95e9
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun May 15 21:23:03 2011 +0200

    Correct derivative main sources.list entries.

diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index f2971cf..3d2b051 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -53,26 +53,35 @@ cat > chroot/etc/apt/sources.list << EOF
 deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
 EOF
 
+		if [ "${LB_SOURCE}" = "true" ]
+		then
+			echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+		fi
+
 		if [ "${LB_DERIVATIVE}" = "true" ]
 		then
 
 cat > chroot/etc/apt/sources.list.d/${LB_MODE}.list << EOF
 # /etc/apt/sources.list.d/${LB_MODE}.list
 
-deb ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
 EOF
 
-		fi
+			case "${LB_DISTRIBUTION}" in
+				*-backports)
+					_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
+					;;
+			esac
 
-		if [ "${LB_SOURCE}" = "true" ]
-		then
-			echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+			for _DISTRIBUTION in ${_DISTRIBUTIONS}
+			do
 
-			if [ "${LB_DERIVATIVE}" = "true" ]
-			then
-				echo "deb-src ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
-			fi
-		fi
+				echo "deb ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+				if [ "${LB_SOURCE}" = "true" ]
+				then
+					echo "deb-src ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+				fi
+			done
 
 		if [ "${LB_SECURITY}" = "true" ]
 		then
@@ -572,26 +581,35 @@ cat > chroot/etc/apt/sources.list << EOF
 deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
 EOF
 
+		if [ "${LB_SOURCE}" = "true" ]
+		then
+			echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+		fi
+
 		if [ "${LB_DERIVATIVE}" = "true" ]
 		then
 
 cat > chroot/etc/apt/sources.list.d/${LB_MODE}.list << EOF
 # /etc/apt/sources.list.d/${LB_MODE}.list
 
-deb ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
 EOF
 
-		fi
+			case "${LB_DISTRIBUTION}" in
+				*-backports)
+					_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
+					;;
+			esac
 
-		if [ "${LB_SOURCE}" = "true" ]
-		then
-			echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+			for _DISTRIBUTION in ${_DISTRIBUTIONS}
+			do
 
-			if [ "${LB_DERIVATIVE}" = "true" ]
-			then
-				echo "deb-src ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
-			fi
-		fi
+				echo "deb ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+				if [ "${LB_SOURCE}" = "true" ]
+				then
+					echo "deb-src ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+				fi
+			done
 
 		if [ "${LB_SECURITY}" = "true" ]
 		then

-- 
live-build