aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-10-24 12:28:40 -0700
committerZac Medico <zmedico@gentoo.org>2019-10-24 12:29:26 -0700
commit26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 (patch)
treedfc63ccc9b92667dc6380569a7dad0dd51eed3ab
parentImprove runtime performance of depgraph module functions. (diff)
downloadportage-26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848.tar.gz
portage-26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848.tar.bz2
portage-26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848.zip
fetch: respect try_mirrors parameter for local mirrors
This is needed in order to prevent infinit recursion like this: File "portage/package/ebuild/fetch.py", line 1131, in fetch loc = loc() File "portage/package/ebuild/fetch.py", line 424, in get_mirror_url mysettings, force=1, try_mirrors=0): File "portage/package/ebuild/fetch.py", line 1131, in fetch loc = loc() Bug: https://bugs.gentoo.org/698474 Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--lib/portage/package/ebuild/fetch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py
index cf073436e..58718b568 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -588,7 +588,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
# use_locks = 0
# local mirrors are always added
- if "local" in custommirrors:
+ if try_mirrors and "local" in custommirrors:
mymirrors += custommirrors["local"]
if restrict_mirror: