[SCM] live-build branch, debian-next, updated. debian/3.0_a10-1-19-gc26bce9

Daniel Baumann daniel at debian.org
Fri Jan 7 21:17:49 UTC 2011


The following commit has been merged in the debian-next branch:
commit c26bce9aa7eff64c1d71e1cca0dbe5ed8766c1a0
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 7 22:14:16 2011 +0100

    Updating apt indices defaults for progress.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index d8698d5..8b0fb9f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -723,12 +723,20 @@ Set_defaults ()
 	esac
 
 	# Setting apt indices
-	if echo ${LB_PACKAGE_LISTS} | grep -qs -E "(stripped|minimal)\b"
-	then
-		LB_APT_INDICES="${LB_APT_INDICES:-none}"
-	else
-		LB_APT_INDICES="${LB_APT_INDICES:-true}"
-	fi
+	case "${LB_MODE}" in
+		progress)
+			LB_APT_INDICES="${LB_APT_INDICES:-none}"
+			;;
+
+		*)
+			if echo ${LB_PACKAGE_LISTS} | grep -qs -E "(stripped|minimal)\b"
+			then
+				LB_APT_INDICES="${LB_APT_INDICES:-none}"
+			else
+				LB_APT_INDICES="${LB_APT_INDICES:-true}"
+			fi
+			;;
+	esac
 
 	# Setting bootloader
 	if [ -z "${LB_BOOTLOADER}" ]

-- 
live-build



More information about the debian-live-changes mailing list