[SCM] debian-live branch, master, updated. 1.0_a47-1-54-gbcd8472

Chris Lamb chris at chris-lamb.co.uk
Fri Jun 20 00:45:18 UTC 2008


The following commit has been merged in the master branch:
commit 733e45330642e61321cf1c79cb0579043ec0030f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Jun 20 01:32:03 2008 +0100

    Migrate a In_list candidate to grep -E.
    
    Perhaps we could .-include the In_list function?
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/functions/defaults.sh b/functions/defaults.sh
index d4c12da..027d137 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -673,7 +673,7 @@ Check_defaults ()
 		fi
 	fi
 
-	if [ "${LH_PACKAGES_LISTS}" = "stripped" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
+	if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
 	then
 		if [ "${LH_APT}" = "aptitude" ]
 		then

-- 
debian-live



More information about the debian-live-changes mailing list