[SCM] live-build branch, debian, updated. debian/3.0_a30-1-31-g468a41f

Daniel Baumann daniel at debian.org
Wed Sep 7 15:43:10 UTC 2011


The following commit has been merged in the debian branch:
commit 72ec4c30be6f8834d12b0d9ca22563523d322f91
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Aug 24 23:16:13 2011 +0200

    Avoiding magic defaults for --apt-indices option when using minimal or stripped packagelist.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index ec283d4..098fa88 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -833,12 +833,7 @@ Set_defaults ()
 			;;
 
 		*)
-			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
+			LB_APT_INDICES="${LB_APT_INDICES:-true}"
 			;;
 	esac
 

-- 
live-build



More information about the debian-live-changes mailing list