[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-13-g83f59dc

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 83f59dc694ef7de49066167a99c2f5a6c83a4e81
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 9 20:32:14 2010 +0200

    Adding --repositories, part 3.

diff --git a/Makefile b/Makefile
index ba22671..0c6f6ed 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ build:
 install:
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r cgi data examples live-helper.sh functions helpers hooks includes lists templates $(DESTDIR)/usr/share/live-helper
+	cp -r cgi data examples live-helper.sh functions helpers hooks includes lists repositories templates $(DESTDIR)/usr/share/live-helper
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 3ba6cc4..7a59a25 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -127,10 +127,16 @@ case "${1}" in
 			do
 				if [ -e "${LH_BASE}/repositories/${REPOSITORY}.chroot" ]
 				then
-					cp "${LH_BASE}/repositories/${REPOSITORY}.chroot" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+					"${LH_BASE}/repositories/${REPOSITORY}.chroot" > \
+					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 				elif [ -e "${LH_BASE}/repositories/${REPOSITORY}" ]
 				then
-					cp "${LH_BASE}/repositories/${REPOSITORY}" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+					"${LH_BASE}/repositories/${REPOSITORY}" > \
+					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 				fi
 			done
 		fi
@@ -477,10 +483,16 @@ case "${1}" in
 
 				if [ -e "${LH_BASE}/repositories/${REPOSITORY}.binary" ]
 				then
-					cp "${LH_BASE}/repositories/${REPOSITORY}.binary" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+					"${LH_BASE}/repositories/${REPOSITORY}.binary" > \
+					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 				elif [ -e "${LH_BASE}/repositories/${REPOSITORY}" ]
 				then
-					cp "${LH_BASE}/repositories/${REPOSITORY}" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+					"${LH_BASE}/repositories/${REPOSITORY}" > \
+					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 				fi
 			done
 		fi
diff --git a/repositories/backports.debian-maintainers.org b/repositories/backports.debian-maintainers.org
index 4ebb205..8ba3e02 100644
--- a/repositories/backports.debian-maintainers.org
+++ b/repositories/backports.debian-maintainers.org
@@ -1,3 +1,3 @@
 # Backports Maintainers
-deb http://backports.debian-maintainers.org/ @DISTRIBUTION@/backports @SECTIONS@
-deb-src http://backports.debian-maintainers.org/ @DISTRIBUTION@/backports @SECTIONS@
+deb http://backports.debian-maintainers.org/ @DISTRIBUTION@/backports @ARCHIVE_AREAS@
+deb-src http://backports.debian-maintainers.org/ @DISTRIBUTION@/backports @ARCHIVE_AREAS@
diff --git a/repositories/live.debian.net b/repositories/live.debian.net
index 3193c5c..54d1399 100644
--- a/repositories/live.debian.net
+++ b/repositories/live.debian.net
@@ -1,3 +1,3 @@
 # Debian Live Project
-deb http://live.debian.net/ @DISTRIBUTION at -snapshots @SECTIONS@
-deb-src http://live.debian.net/ @DISTRIBUTION at -snapshots @SECTIONS@
+deb http://live.debian.net/ @DISTRIBUTION at -snapshots @ARCHIVE_AREAS@
+deb-src http://live.debian.net/ @DISTRIBUTION at -snapshots @ARCHIVE_AREAS@
diff --git a/repositories/unofficial.debian-maintainers.org b/repositories/unofficial.debian-maintainers.org
index fe4f934..97093c4 100644
--- a/repositories/unofficial.debian-maintainers.org
+++ b/repositories/unofficial.debian-maintainers.org
@@ -1,3 +1,3 @@
 # Unofficial Maintainers
-deb http://unofficial.debian-maintainers.org/ @DISTRIBUTION@ @SECTIONS@ restricted
-deb-src http://unofficial.debian-maintainers.org/ @DISTRIBUTION@ @SECTIONS@ restricted
+deb http://unofficial.debian-maintainers.org/ @DISTRIBUTION@ @ARCHIVE_AREAS@ restricted
+deb-src http://unofficial.debian-maintainers.org/ @DISTRIBUTION@ @ARCHIVE_AREAS@ restricted

-- 
live-helper