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 63F511382C5 for ; Sat, 5 Jun 2021 18:08:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C1D0E0900; Sat, 5 Jun 2021 18:08:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0AF9FE08F6 for ; Sat, 5 Jun 2021 18:08:12 +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 67A78335DED for ; Sat, 5 Jun 2021 18:08:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C486079B for ; Sat, 5 Jun 2021 18:08:08 +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: <1622915996.de877dba8af0d57dcf3767a891daf3fd6908d7ff.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: de877dba8af0d57dcf3767a891daf3fd6908d7ff X-VCS-Branch: master Date: Sat, 5 Jun 2021 18:08:08 +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: 87b68819-2869-45d1-a673-dedefc1c4564 X-Archives-Hash: 358f9c5993fd4bafb3829e3d494a0e92 commit: de877dba8af0d57dcf3767a891daf3fd6908d7ff Author: Daniel M. Weeks danweeks net> AuthorDate: Mon May 31 15:46:55 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 5 17:59:56 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=de877dba Support GLEP 75 layout in GENTOO_MIRRORS Signed-off-by: Daniel M. Weeks danweeks.net> 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 c2bfca61c..c2f7dffc0 100644 --- a/lib/portage/package/ebuild/fetch.py +++ b/lib/portage/package/ebuild/fetch.py @@ -1253,7 +1253,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, if fsmirrors and not os.path.exists(myfile_path) and has_space: for mydir in fsmirrors: - mirror_file = os.path.join(mydir, myfile) + mirror_file = get_mirror_url(mydir, myfile, mysettings) try: shutil.copyfile(mirror_file, download_path) writemsg(_("Local mirror has file: %s\n") % myfile)