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 1SSZUO-0006cv-0s for garchives@archives.gentoo.org; Thu, 10 May 2012 19:57:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 577FDE0BFE; Thu, 10 May 2012 19:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2B9C9E0BFE for ; Thu, 10 May 2012 19:56:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 745661B4026 for ; Thu, 10 May 2012 19:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3C857E542D for ; Thu, 10 May 2012 19:56:46 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1336679665.933ab0862f7333f0a4d1cc7ac85dea9f2693097c.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master 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: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 933ab0862f7333f0a4d1cc7ac85dea9f2693097c X-VCS-Branch: master Date: Thu, 10 May 2012 19:56:46 +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: eae02e20-3470-4fcb-8be5-3e775212fe45 X-Archives-Hash: 5492d25d981731a0bbba2740a665ba50 commit: 933ab0862f7333f0a4d1cc7ac85dea9f2693097c Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Thu May 10 19:54:25 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail = com> CommitDate: Thu May 10 19:54:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D933ab086 Make REPOSITORY variable again available in global scope of ebuilds, which use EAPI=3D"4-python". This fixes regression introduced in commit 1c26d24dfc869a6f5ef426f7c02e1d= 25abcda34e. --- pym/portage/package/ebuild/doebuild.py | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index ad6857f..faba9b6 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -342,8 +342,10 @@ def doebuild_environment(myebuild, mydo, myroot=3DNo= ne, settings=3DNone, if not eapi_is_supported(eapi): raise UnsupportedAPIException(mycpv, eapi) =20 - if mydo !=3D "depend": + if eapi_exports_REPOSITORY(eapi) and "PORTAGE_REPO_NAME" in mysettings.= configdict["pkg"]: + mysettings.configdict["pkg"]["REPOSITORY"] =3D mysettings.configdict["= pkg"]["PORTAGE_REPO_NAME"] =20 + if mydo !=3D "depend": if hasattr(mydbapi, "getFetchMap") and \ ("A" not in mysettings.configdict["pkg"] or \ "AA" not in mysettings.configdict["pkg"]): @@ -404,11 +406,6 @@ def doebuild_environment(myebuild, mydo, myroot=3DNo= ne, settings=3DNone, mysettings["KV"] =3D "" mysettings.backup_changes("KV") =20 - if eapi_exports_REPOSITORY(eapi) and \ - "PORTAGE_REPO_NAME" in mysettings.configdict["pkg"]: - mysettings.configdict["pkg"]["REPOSITORY"] =3D \ - mysettings.configdict["pkg"]["PORTAGE_REPO_NAME"] - _doebuild_manifest_cache =3D None _doebuild_broken_ebuilds =3D set() _doebuild_broken_manifests =3D set()