[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/03/31 19:33:16

  Modified:             linux-mod.eclass
  Log:
  Bug #312075: The ~ was getting expanded to the optional stuff got duplicated and that sucked, giving a bad warning sometimes.

Revision  Changes    Path
1.99                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.98&r2=1.99

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -p -w -b -B -u -u -r1.98 -r1.99
--- linux-mod.eclass	17 Jan 2010 04:00:07 -0000	1.98
+++ linux-mod.eclass	31 Mar 2010 19:33:16 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.98 2010/01/17 04:00:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.99 2010/03/31 19:33:16 robbat2 Exp $
 
 # Author(s): John Mylchreest <johnm@g.o>,
 #            Stefan Schweizer <genstef@g.o>
@@ -602,11 +602,10 @@ linux-mod_pkg_setup() {
 linux-mod_pkg_setup_binary() {
 	debug-print-function ${FUNCNAME} $*
 	local new_CONFIG_CHECK
+	# ~ needs always to be quoted, else bash expands it.	
 	for config in $CONFIG_CHECK ; do
-		case ${config:0:1} in
-			~) optional="" ;;
-			*) optional="~" ;;
-		esac
+		optional='~'
+		[[ ${config:0:1} == "~" ]] && optional=''
 		new_CONFIG_CHECK="${new_CONFIG_CHECK} ${optional}${config}"
 	done
 	export CONFIG_CHECK="${new_CONFIG_CHECK}"