From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 381FA1380DC for ; Tue, 4 Feb 2014 20:29:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14300E09F7; Tue, 4 Feb 2014 20:29:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C984E09F7 for ; Tue, 4 Feb 2014 20:29:30 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 812C733F911 for ; Tue, 4 Feb 2014 20:29:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 80F0318278 for ; Tue, 4 Feb 2014 20:29:25 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1391545689.9e892c77acd73757e539548346672217ab8bd976.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 9e892c77acd73757e539548346672217ab8bd976 X-VCS-Branch: prefix Date: Tue, 4 Feb 2014 20:29:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 77194b22-8df7-4c91-95d1-a9b79609be4b X-Archives-Hash: 47e064a55fa541a32eccf20058a2441f commit: 9e892c77acd73757e539548346672217ab8bd976 Author: Ruud Koolen gentoo org> AuthorDate: Tue Feb 4 20:28:09 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Feb 4 20:28:09 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9e892c77 doebuild_environment: don't set EPREFIX `mysettings` is a config object, which initializes a value of EPREFIX in its constructor (pym/portage/package/ebuild/config.py:489), and it is this value that should be used, not the constant one. --- pym/portage/package/ebuild/doebuild.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 374cc9a..2f08593 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -319,7 +319,6 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, # due to how it's coded... Don't overwrite this so we can use it. mysettings["PORTAGE_DEBUG"] = "1" - mysettings["EPREFIX"] = EPREFIX mysettings["EBUILD"] = ebuild_path mysettings["O"] = pkg_dir mysettings.configdict["pkg"]["CATEGORY"] = cat