From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8ACEC138334 for ; Thu, 24 Oct 2019 19:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D519E0823; Thu, 24 Oct 2019 19:31:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77AA0E0823 for ; Thu, 24 Oct 2019 19:31:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F25C34C2CF for ; Thu, 24 Oct 2019 19:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73E80773 for ; Thu, 24 Oct 2019 19:31:21 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1571945366.26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/fetch.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 X-VCS-Branch: master Date: Thu, 24 Oct 2019 19:31:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4e81fa4a-1030-4cfa-95a6-2661448d7b2f X-Archives-Hash: 75827c03d0b9b053c8161e6ae40db5fe commit: 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 Author: Zac Medico gentoo org> AuthorDate: Thu Oct 24 19:28:40 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Oct 24 19:29:26 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=26fd7ffd 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 gentoo.org> lib/portage/package/ebuild/fetch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: