[SCM] live-build branch, debian-next, updated. debian/3.0_a40-1-16-ge05fa00

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e05fa004ff097261735253995ec543e71c229004
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 7 19:54:56 2012 +0100

    Correcting assembling of automatic pinning in progress mode.

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 565cb0a..cf92c38 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -152,23 +152,21 @@ case "${1}" in
 				then
 					echo "# /etc/apt/preferences.d/progress.pref" > chroot/etc/apt/preferences.d/progress.pref
 
-					case "${LB_DISTRIBUTION}" in
-						*-backports)
-							_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
-							;;
-
-						*)
-							_DISTRIBUTIONS="${LB_DISTRIBUTION}"
-							;;
-					esac
+					_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')"
 
 					if [ "${LB_SECURITY}" = "true" ]
 					then
-						case "${LB_DISTRIBUTION}" in
-							artax)
-								_DISTRIBUTION="${_DISTRIBUTION} ${LB_DISTRIBUTION}-security"
-								;;
-						esac
+						_DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-security"
+					fi
+
+					if [ "${LB_VOLATILE}" = "true" ]
+					then
+						_DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-updates"
+					fi
+
+					if [ "${LB_BACKPORTS}" = "true" ]
+					then
+						_DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-backports"
 					fi
 
 					for _DISTRIBUTION in ${_DISTRIBUTIONS}

-- 
live-build