[SCM] live-build branch, debian, updated. debian/2.0.6-1-10-g58afd94

Daniel Baumann daniel at debian.org
Mon Nov 22 22:15:38 UTC 2010


The following commit has been merged in the debian branch:
commit 5519334b8c2e1a6f09a79e7222f72cc5b25e1beb
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 13 17:39:29 2010 +0100

    Updating volatile urls for squeeze.

diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 334803a..5e65eca 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -88,15 +88,25 @@ EOF
 		then
 			case "${LB_MODE}" in
 				debian|debian-release)
-					if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
-					then
-						echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-						if [ "${LB_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
+					case "${LB_DISTRIBUTION}" in
+						lenny)
+							echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+							if [ "${LB_SOURCE}" = "true" ]
+							then
+								echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+							fi
+							;;
+
+						squeeze)
+							echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+							if [ "${LB_SOURCE}" = "true" ]
+							then
+								echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+							fi
+							;;
+					esac
 					;;
 
 				ubuntu)
@@ -532,15 +542,25 @@ EOF
 		then
 			case "${LB_MODE}" in
 				debian|debian-release)
-					if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
-					then
-						echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-						if [ "${LB_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
+					case "${LB_DISTRIBUTION}" in
+						lenny)
+							echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+							if [ "${LB_SOURCE}" = "true" ]
+							then
+								echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+							fi
+							;;
+
+						squeeze)
+							echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+							if [ "${LB_SOURCE}" = "true" ]
+							then
+								echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+							fi
+							;;
+					esac
 					;;
 
 				ubuntu)

-- 
live-build



More information about the debian-live-changes mailing list