[SCM] live-build branch, debian-next, updated. debian/3.0_a42-1-22-g9748221

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 97482214bb3ccd7ba5e8521c13d878758d085c32
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Feb 4 22:40:41 2012 +0100

    Simplyfing automatic pinning in derivative modes.

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 95c6159..2c79ee6 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -150,22 +150,28 @@ case "${1}" in
 			progress)
 				if [ ! -e chroot/etc/apt/preferences.d/progress.pref ]
 				then
-					_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')"
+					_DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')"
+
+					_DISTRIBUTIONS="${_DISTRIBUTION}"
 
 					if [ "${LB_SECURITY}" = "true" ]
 					then
-						_DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-security"
+						_DISTRIBUTIONS="${_DISTRIBUTIONS} ${_DISTRIBUTION}-security"
 					fi
 
 					if [ "${LB_VOLATILE}" = "true" ]
 					then
-						_DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-updates"
+						_DISTRIBUTIONS="${_DISTRIBUTIONS} ${_DISTRIBUTION}-updates"
 					fi
 
-					if [ "${LB_BACKPORTS}" = "true" ]
-					then
-						_DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-backports"
-					fi
+					case "${LB_DISTRIBUTION}" in
+						*-backports)
+							if [ "${LB_BACKPORTS}" = "true" ] 
+							then
+								_DISTRIBUTIONS="${_DISTRIBUTIONS} ${_DISTRIBUTION}-backports"
+							fi
+							;;
+					esac
 
 					for _DISTRIBUTION in ${_DISTRIBUTIONS}
 					do

-- 
live-build