From e05fa004ff097261735253995ec543e71c229004 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 7 Jan 2012 19:54:56 +0100
Subject: Correcting assembling of automatic pinning in progress mode.

---
 scripts/build/lb_chroot_apt | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'scripts/build')

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 565cb0a64..cf92c3811 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}
-- 
cgit v1.2.3