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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 36ecab10d372152acf7522d1d1f6274c938f72dd
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 15 21:27:29 2011 +0200

    Using .list suffix in config/archives.

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index b85b708..69ac751 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -248,15 +248,15 @@ EOF
 		fi
 
 		# Check local sources.list
-		if Find_files config/archives/*.chroot
+		if Find_files config/archives/*.chroot.list
 		then
-			for FILE in config/archives/*.chroot
+			for FILE in config/archives/*.chroot.list
 			do
 				sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
 				    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 				    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
 				    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
-				"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
+				"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot.list).list"
 			done
 		fi
 
@@ -767,15 +767,15 @@ EOF
 		fi
 
 		# Check local sources.list
-		if Find_files config/archives/*.binary
+		if Find_files config/archives/*.binary.list
 		then
-			for FILE in config/archives/*.binary
+			for FILE in config/archives/*.binary.list
 			do
 				sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
 				    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 				    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
 				    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
-				"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
+				"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary.list).list"
 			done
 		fi
 

-- 
live-build