[SCM] live-build branch, debian, updated. debian/3.0_a16-1-18-g26ad091

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit a657b49ea2ba8f848d8d777ea0ba1944da7aa734
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun May 15 20:53:24 2011 +0200

    Don't add security repository for wheezy.

diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index a864361..b0955e9 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -78,15 +78,20 @@ EOF
 		then
 			case "${LB_MODE}" in
 				debian|progress)
-					if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
-					then
-						echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					case "${LB_PARENT_DISTRIBUTION}" in
+						sid|wheezy)
 
-						if [ "${LB_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
+							;;
+
+						*)
+							echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+							if [ "${LB_SOURCE}" = "true" ]
+							then
+								echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+							fi
+							;;
+					esac
 
 					if [ "${LB_MODE}" = progress ]
 					then
@@ -584,15 +589,20 @@ EOF
 		then
 			case "${LB_MODE}" in
 				debian|progress)
-					if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
-					then
-						echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					case "${LB_PARENT_DISTRIBUTION}" in
+						sid|wheezy)
 
-						if [ "${LB_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
+							;;
+
+						*)
+							echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+							if [ "${LB_SOURCE}" = "true" ]
+							then
+								echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+							fi
+							;;
+					esac
 
 					if [ "${LB_MODE}" = progress ]
 					then

-- 
live-build