aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2024-03-09 15:23:28 -0800
committerZac Medico <zmedico@gentoo.org>2024-03-09 15:24:44 -0800
commitc3ed026be40b4cf857b33854e70f59f7e016e3b5 (patch)
tree8018c7e3593aa966d1aedc4450e18336de54bf87
parentEbuildPhase/EbuildBinpkg: Ensure PKGDIR subdirectory permissions (diff)
downloadportage-c3ed026be40b4cf857b33854e70f59f7e016e3b5.tar.gz
portage-c3ed026be40b4cf857b33854e70f59f7e016e3b5.tar.bz2
portage-c3ed026be40b4cf857b33854e70f59f7e016e3b5.zip
_setup_repo_revisions: Skip async_aux_get for INHERITED
Since INHERITED is always available for the ebuild environment, get it from settings.configdict["pkg"]["INHERITED"]. Fixes: d55d415a4f68 ("EbuildPhase/EbuildBinpkg: Ensure PKGDIR subdirectory permissions") Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--lib/_emerge/EbuildPhase.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py
index 73c284fe4..9e5268ff7 100644
--- a/lib/_emerge/EbuildPhase.py
+++ b/lib/_emerge/EbuildPhase.py
@@ -92,17 +92,10 @@ async def _setup_repo_revisions(settings):
and repo_name
and "PORTAGE_REPO_REVISIONS" not in settings.configdict["pkg"]
):
- inherits = frozenset(
- (
- await db.async_aux_get(
- settings.mycpv,
- ["INHERITED"],
- myrepo=repo_name,
- )
- )[0].split()
- )
repo = db.repositories[repo_name]
- ec_dict = repo.eclass_db.get_eclass_data(inherits)
+ ec_dict = repo.eclass_db.get_eclass_data(
+ settings.configdict["pkg"]["INHERITED"].split()
+ )
referenced_repos = {repo.name: repo}
for ec_info in ec_dict.values():
ec_repo = db.repositories.get_repo_for_location(