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 1RWra3-0006z0-6d for garchives@archives.gentoo.org; Sat, 03 Dec 2011 15:32:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97003E0486; Sat, 3 Dec 2011 15:32:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 66327E0486 for ; Sat, 3 Dec 2011 15:32:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E34BC1B4015 for ; Sat, 3 Dec 2011 15:32:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C23C380044 for ; Sat, 3 Dec 2011 15:22:30 +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: 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: d6b379cff421282d6a0dac5f4ea65be40df4175a Date: Sat, 3 Dec 2011 15:22:30 +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: f8d955f0-800d-4a80-a871-be3feaac49fa X-Archives-Hash: a8de997997461b28182858981fcba167 commit: d6b379cff421282d6a0dac5f4ea65be40df4175a Author: Fabian Groffen gentoo org> AuthorDate: Sat Dec 3 15:19:56 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Dec 3 15:19:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd6b379cf misc-functions.sh: don't set local ED/EPREFIX some more In Prefix EPREFIX, ED are always set, so don't try to redefine them with wrong values (or local). In fact, it fails because ED and EPREFIX are defined as read-only. --- bin/misc-functions.sh | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 58f5bc8..20d52a7 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -70,7 +70,9 @@ canonicalize() { prepcompress() { local -a include exclude incl_d incl_f local f g i real_f real_d - case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # PREFIX LOCAL: always support ED + #case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # END PREFIX LOCAL =20 # Canonicalize path names and check for their existence. real_d=3D$(canonicalize "${ED}") @@ -1514,7 +1516,9 @@ preinst_mask() { return 1 fi =20 - case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # PREFIX LOCAL: always support ED + #case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # END PREFIX LOCAL =20 # Make sure $PWD is not ${D} so that we don't leave gmon.out files # in there in case any tools were built with -pg in CFLAGS. @@ -1542,7 +1546,9 @@ preinst_sfperms() { return 1 fi =20 - case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # PREFIX LOCAL: always support ED + #case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # END PREFIX LOCAL =20 # Smart FileSystem Permissions if has sfperms $FEATURES; then @@ -1580,7 +1586,9 @@ preinst_suid_scan() { return 1 fi =20 - case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # PREFIX LOCAL: always support ED + #case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # END PREFIX LOCAL =20 # total suid control. if has suidctl $FEATURES; then @@ -1645,7 +1653,9 @@ preinst_selinux_labels() { =20 dyn_package() { =20 - case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # PREFIX LOCAL: always support ED + #case "$EAPI" in 0|1|2) local ED=3D${D} ;; esac + # END PREFIX LOCAL =20 # Make sure $PWD is not ${D} so that we don't leave gmon.out files # in there in case any tools were built with -pg in CFLAGS. @@ -1725,7 +1735,9 @@ __END1__ =20 dyn_rpm() { =20 - case "$EAPI" in 0|1|2) local EPREFIX=3D ;; esac + # PREFIX LOCAL: always support ED + #case "$EAPI" in 0|1|2) local EPREFIX=3D ;; esac + # END PREFIX LOCAL =20 cd "${T}" || die "cd failed" local machine_name=3D$(uname -m)