From: Zac Medico Date: Sat, 8 Sep 2012 16:15:39 +0000 (-0700) Subject: best/has_version: --host-root first arg only X-Git-Tag: v2.2.0_alpha125~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d23756ce3cb10fecbb8735fbbc784ef76e1621f3;p=portage.git best/has_version: --host-root first arg only --- diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 0587991f9..18877f059 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -656,18 +656,13 @@ _eapi5_apply_user_patches() { has_version() { local atom eroot host_root=false root=${ROOT} - while [ $# -gt 0 ] ; do - case "$1" in - --host-root) - host_root=true - ;; - *) - [[ -n ${atom} ]] && die "${FUNCNAME[0]}: unused argument: $1" - atom=$1 - ;; - esac + if [[ $1 == --host-root ]] ; then + host_root=true shift - done + fi + atom=$1 + shift + [ $# -gt 0 ] && die "${FUNCNAME[0]}: unused argument(s): $*" if ${host_root} ; then case "${EAPI}" in @@ -713,18 +708,13 @@ has_version() { best_version() { local atom eroot host_root=false root=${ROOT} - while [ $# -gt 0 ] ; do - case "$1" in - --host-root) - host_root=true - ;; - *) - [[ -n ${atom} ]] && die "${FUNCNAME[0]}: unused argument: $1" - atom=$1 - ;; - esac + if [[ $1 == --host-root ]] ; then + host_root=true shift - done + fi + atom=$1 + shift + [ $# -gt 0 ] && die "${FUNCNAME[0]}: unused argument(s): $*" if ${host_root} ; then case "${EAPI}" in