diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-05-10 21:54:25 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-05-10 21:54:25 +0200 |
| commit | 933ab0862f7333f0a4d1cc7ac85dea9f2693097c (patch) | |
| tree | 7cb2f307711fa9c24ecdeee56ad3ea3c0e4aaa0e | |
| parent | b59bd3348d709aa53c6883006313bdbdc9c737ea (diff) | |
| download | portage-933ab0862f7333f0a4d1cc7ac85dea9f2693097c.tar.gz portage-933ab0862f7333f0a4d1cc7ac85dea9f2693097c.tar.bz2 portage-933ab0862f7333f0a4d1cc7ac85dea9f2693097c.zip | |
Make REPOSITORY variable again available in global scope of ebuilds,
which use EAPI="4-python".
This fixes regression introduced in commit 1c26d24dfc869a6f5ef426f7c02e1d25abcda34e.
| -rw-r--r-- | 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 ad6857f7e..faba9b696 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=None, settings=None, if not eapi_is_supported(eapi): raise UnsupportedAPIException(mycpv, eapi) - if mydo != "depend": + if eapi_exports_REPOSITORY(eapi) and "PORTAGE_REPO_NAME" in mysettings.configdict["pkg"]: + mysettings.configdict["pkg"]["REPOSITORY"] = mysettings.configdict["pkg"]["PORTAGE_REPO_NAME"] + if mydo != "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=None, settings=None, mysettings["KV"] = "" mysettings.backup_changes("KV") - if eapi_exports_REPOSITORY(eapi) and \ - "PORTAGE_REPO_NAME" in mysettings.configdict["pkg"]: - mysettings.configdict["pkg"]["REPOSITORY"] = \ - mysettings.configdict["pkg"]["PORTAGE_REPO_NAME"] - _doebuild_manifest_cache = None _doebuild_broken_ebuilds = set() _doebuild_broken_manifests = set() |