[SCM] live-build branch, debian, updated. debian/3.0_a13-1-15-gee8d589

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 2c904bfbe0cea3fadedc08e8e509692d7779c3a3
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..771c077 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -216,13 +216,13 @@ EOF
 					if [ -e "${PLACE}/${REPOSITORY}.chroot" ]
 					then
 						sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
+						    -e "s|@ARCHIVE_AREAS@|${LB_PARENT_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" \
-						    -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
@@ -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