[SCM] live-build branch, debian-next, updated. debian/3.0_a16-1-7-gebc3788
Daniel Baumann
daniel at debian.org
Sun May 15 18:58:46 UTC 2011
The following commit has been merged in the debian-next branch:
commit ebc3788bf2447d7a7a0c6bdb39634f044037eaa9
Author: Daniel Baumann <daniel at debian.org>
Date: Sun May 15 20:56:26 2011 +0200
Avoid wrong security mirrors when building for artax-backports.
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index b0955e9..f2971cf 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -95,12 +95,20 @@ EOF
if [ "${LB_MODE}" = progress ]
then
- echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ case "${LB_DISTRIBUTION}" in
+ *-backports)
- if [ "${LB_SOURCE}" = "true" ]
- then
- echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- fi
+ ;;
+
+ *)
+ echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ ;;
+ esac
else
if [ "${LB_DERIVATIVE}" = "true" ]
then
@@ -606,12 +614,20 @@ EOF
if [ "${LB_MODE}" = progress ]
then
- echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ case "${LB_DISTRIBUTION}" in
+ *-backports)
- if [ "${LB_SOURCE}" = "true" ]
- then
- echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- fi
+ ;;
+
+ *)
+ echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ ;;
+ esac
else
if [ "${LB_DERIVATIVE}" = "true" ]
then
--
live-build
More information about the debian-live-changes
mailing list