From: Zac Medico Date: Sat, 7 Feb 2009 19:41:09 +0000 (-0000) Subject: Escape globs in hasgq arguments in order to prevent bash from trying X-Git-Tag: v2.2_rc24~211 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=702d1529d6d7cedd4255e3e6da0be5cca2a69f05;p=portage.git Escape globs in hasgq arguments in order to prevent bash from trying to perform filename expansion. svn path=/main/trunk/; revision=12591 --- 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}"