From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 03:47:19 +0000 (-0000)
Subject: Escape globs in hasgq arguments in order to prevent bash from trying
X-Git-Tag: v2.1.6.8~205
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f6d435b8a12fc2b3994041fdf8755cd9bf8c4d57;p=portage.git

Escape globs in hasgq arguments in order to prevent bash from trying
to perform filename expansion. (trunk r12591)

svn path=/main/branches/2.1.6/; revision=12872
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 124fd35ab..301eb7949 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -486,9 +486,9 @@ econf() {
 		if [[ -n ${ABI} && -n ${!LIBDIR_VAR} ]] ; then
 			CONF_LIBDIR=${!LIBDIR_VAR}
 		fi
-		if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=* "$@" ; then
-			export CONF_PREFIX=$(hasg --exec-prefix=* "$@")
-			[[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=* "$@")
+		if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=\* "$@" ; then
+			export CONF_PREFIX=$(hasg --exec-prefix=\* "$@")
+			[[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=\* "$@")
 			: ${CONF_PREFIX:=/usr}
 			CONF_PREFIX=${CONF_PREFIX#*=}
 			[[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}"