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 1QuqOP-0002Cf-KW for garchives@archives.gentoo.org; Sat, 20 Aug 2011 18:35:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D760921C0C9; Sat, 20 Aug 2011 18:35:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A3A3D21C0C9 for ; Sat, 20 Aug 2011 18:35:30 +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 F24BF1B404B for ; Sat, 20 Aug 2011 18:35:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 166A380040 for ; Sat, 20 Aug 2011 18:35:29 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <0b4156a55f460d501145936fe7d1dec022f5a5f9.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 0b4156a55f460d501145936fe7d1dec022f5a5f9 Date: Sat, 20 Aug 2011 18:35:29 +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: f2d75dfb13e386d3e9d9d56ef64c7662 commit: 0b4156a55f460d501145936fe7d1dec022f5a5f9 Author: Fabian Groffen gentoo org> AuthorDate: Sat Aug 20 18:32:09 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Aug 20 18:32:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0b4156a5 fix-shebangs: fix regression for symlinked files The code to check whether symlinked files point outside the prefix was incorrect. It didn't include the install image location, hence it always concluded a symlinked script was pointing to outside the prefix, leading to bugs like #378515. --- bin/misc-functions.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index eb2235d..750f500 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -839,7 +839,7 @@ install_qa_check_prefix() { [[ ${rf} !=3D /* ]] && rf=3D${fn%/*}/${rf} # ignore symlinks pointing to outside prefix # as seen in sys-devel/native-cctools - [[ ${rf} !=3D ${EPREFIX}/* && $(canonicalize "${rf}") !=3D ${eprefix}= /* ]] && continue + [[ $(canonicalize "/${rf#${D}}") !=3D ${eprefix}/* ]] && continue fi # does the shebang start with ${EPREFIX}, and does it exist? if [[ ${line[0]} =3D=3D ${EPREFIX}/* || ${line[0]} =3D=3D ${eprefix}/*= ]] ; then