From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QwHHO-0006EQ-O7 for garchives@archives.gentoo.org; Wed, 24 Aug 2011 17:30:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E49621C184; Wed, 24 Aug 2011 17:30:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C96F21C184 for ; Wed, 24 Aug 2011 17:30:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4ED51B401C for ; Wed, 24 Aug 2011 17:30:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C347680040 for ; Wed, 24 Aug 2011 17:30:09 +0000 (UTC) From: "Paul Varner" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" Message-ID: <6edc15a5690a3c26a3c530669a922e01f50ab830.fuzzyray@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: bin/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: bin/euse X-VCS-Directories: bin/ X-VCS-Committer: fuzzyray X-VCS-Committer-Name: Paul Varner X-VCS-Revision: 6edc15a5690a3c26a3c530669a922e01f50ab830 Date: Wed, 24 Aug 2011 17:30:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7986ff74529447ac7ce019530af56456 commit: 6edc15a5690a3c26a3c530669a922e01f50ab830 Author: Paul Varner gentoo org> AuthorDate: Wed Aug 24 17:28:06 2011 +0000 Commit: Paul Varner gentoo org> CommitDate: Wed Aug 24 17:28:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoolkit.gi= t;a=3Dcommit;h=3D6edc15a5 Fix traversal of cascading profiles by euse (Bug 379559). Thanks to Ian Abbot for the patch! --- bin/euse | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/euse b/bin/euse index be47cc9..bedba35 100755 --- a/bin/euse +++ b/bin/euse @@ -439,7 +439,6 @@ traverse_profile() { =09 curdir=3D"${2:-$(get_real_path ${MAKE_PROFILE_PATH})}" =09 - [[ -f "${curdir}/${1}" ]] && rvalue=3D"${curdir}/${1} ${rvalue}" if [[ -f "${curdir}/parent" ]]; then for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do # Bug 231394, handle parent path being absolute @@ -448,9 +447,10 @@ traverse_profile() { else pdir=3D"$(get_real_path ${curdir}/${parent})" fi - rvalue=3D"$(traverse_profile ${1} ${pdir}) ${rvalue}" + rvalue=3D"${rvalue} $(traverse_profile ${1} ${pdir})" done fi + [[ -f "${curdir}/${1}" ]] && rvalue=3D"${rvalue} ${curdir}/${1}" =20 echo "${rvalue}" } # }}}