summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-03-31 19:33:16 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-03-31 19:33:16 +0000
commitf0ec7f809d04e15dc5c237d77bf7419104325178 (patch)
tree449286a494ac537e0619c4fbff5da23485ed21cb /eclass
parentVersion bump. (diff)
downloadgentoo-2-f0ec7f809d04e15dc5c237d77bf7419104325178.tar.gz
gentoo-2-f0ec7f809d04e15dc5c237d77bf7419104325178.tar.bz2
gentoo-2-f0ec7f809d04e15dc5c237d77bf7419104325178.zip
Bug #312075: The ~ was getting expanded to the optional stuff got duplicated and that sucked, giving a bad warning sometimes.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/linux-mod.eclass9
1 files changed, 4 insertions, 5 deletions
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 7ffd8a218a25..a1d0aebe2c9b 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -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@gentoo.org>,
# Stefan Schweizer <genstef@gentoo.org>
@@ -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}"