From 2b8ed9524ba9815f3bcdd272fda2b938caee270c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 6 Aug 2013 13:01:59 -0700 Subject: [PATCH] thirdpartymirrors: use RepoConfig.prepos_order This equivalent to, but more efficient than splitting PORTDIR_OVERLAY. --- pym/portage/package/ebuild/config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 070a522b9..92e6c3fed 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -2684,10 +2684,11 @@ class config(object): def thirdpartymirrors(self): if getattr(self, "_thirdpartymirrors", None) is None: - profileroots = [os.path.join(self["PORTDIR"], "profiles")] - for x in shlex_split(self.get("PORTDIR_OVERLAY", "")): - profileroots.insert(0, os.path.join(x, "profiles")) - thirdparty_lists = [grabdict(os.path.join(x, "thirdpartymirrors")) for x in profileroots] + thirdparty_lists = [] + for repo_name in reversed(self.repositories.prepos_order): + thirdparty_lists.append(grabdict(os.path.join( + self.repositories[repo_name].location, + "profiles", "thirdpartymirrors"))) self._thirdpartymirrors = stack_dictlist(thirdparty_lists, incremental=True) return self._thirdpartymirrors -- 2.26.2