diff options
| author |   Daniel M. Weeks <dan@danweeks.net> | 2021-05-31 12:10:21 -0400 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2021-06-05 11:03:45 -0700 |
| commit | 2fe8238b540240a62de3513839974e033f0bacd2 (patch) | |
| tree | 4b4d604ab54c34351c3f0512192e32c8aa870001 | |
| parent | Support GLEP 75 layout in GENTOO_MIRRORS (diff) | |
| download | portage-2fe8238b540240a62de3513839974e033f0bacd2.tar.gz portage-2fe8238b540240a62de3513839974e033f0bacd2.tar.bz2 portage-2fe8238b540240a62de3513839974e033f0bacd2.zip | |
Support GLEP 75 in PORTAGE_RO_DISTDIRS size check
Closes: https://github.com/gentoo/portage/pull/724
Signed-off-by: Daniel M. Weeks <dan@danweeks.net>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | lib/portage/dbapi/porttree.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py index 99c36450c..0f50f1338 100644 --- a/lib/portage/dbapi/porttree.py +++ b/lib/portage/dbapi/porttree.py @@ -12,7 +12,7 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.dbapi.dep_expand:dep_expand', 'portage.dep:Atom,dep_getkey,match_from_list,use_reduce,_match_slot', 'portage.package.ebuild.doebuild:doebuild', - 'portage.package.ebuild.fetch:_download_suffix', + 'portage.package.ebuild.fetch:get_mirror_url,_download_suffix', 'portage.util:ensure_dirs,shlex_split,writemsg,writemsg_level', 'portage.util.listdir:listdir', 'portage.versions:best,catsplit,catpkgsplit,_pkgsplit@pkgsplit,ver_regexp,_pkg_str', @@ -859,7 +859,11 @@ class portdbapi(dbapi): if ro_distdirs is not None: for x in shlex_split(ro_distdirs): try: - mystat = os.stat(os.path.join(x, myfile)) + mystat = os.stat( + portage.package.ebuild.fetch.get_mirror_url( + x, myfile, self.settings + ) + ) except OSError: pass else: |