[SCM] live-build branch, debian-next, updated. debian/3.0_a13-1-14-ga8d2043

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit a8d20431e5889bcef5094817868e860dab09bb57
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 24 20:47:20 2011 +0100

    Correcting repository handling for live.debian.net wrt/ derivatives.

diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index c552646..39e5f61 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -215,13 +215,13 @@ EOF
 					# Adding sources.list entries (chroot)
 					if [ -e "${PLACE}/${REPOSITORY}.chroot" ]
 					then
-						sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
+						sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
 						    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 						"${PLACE}/${REPOSITORY}.chroot" > \
 						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 					elif [ -e "${PLACE}/${REPOSITORY}" ]
 					then
-						sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
+						sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
 						    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 						"${PLACE}/${REPOSITORY}" > \
 						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
@@ -688,13 +688,13 @@ EOF
 					if [ -e "${PLACE}/${REPOSITORY}.binary" ]
 					then
 						sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
+						    -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 						"${PLACE}/${REPOSITORY}.binary" > \
 						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 					elif [ -e "${PLACE}/${REPOSITORY}" ]
 					then
 						sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
+						    -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 						"${PLACE}/${REPOSITORY}" > \
 						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 					fi

-- 
live-build