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 75C661382C5 for ; Sun, 20 Jun 2021 18:54:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96951E0801; Sun, 20 Jun 2021 18:54:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 7F937E0801 for ; Sun, 20 Jun 2021 18:54:51 +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 6E5EE335C9F for ; Sun, 20 Jun 2021 18:54:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE27379A for ; Sun, 20 Jun 2021 18:54:48 +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: <1624215261.2ce11f06e48290efb2d4b6743c8edf01c176b0fc.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: 2ce11f06e48290efb2d4b6743c8edf01c176b0fc X-VCS-Branch: master Date: Sun, 20 Jun 2021 18:54:48 +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: 2368c589-7678-4b73-b977-fd905bf78996 X-Archives-Hash: e20b81d13996d2d6160c8c0d7ba15ca3 commit: 2ce11f06e48290efb2d4b6743c8edf01c176b0fc Author: Michał Górny gentoo org> AuthorDate: Sun Jun 20 17:53:02 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jun 20 18:54:21 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2ce11f06 fetch: Fix AttributeError when no URL specified Closes: https://github.com/gentoo/portage/pull/732 Bug: https://bugs.gentoo.org/796812 Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Zac Medico gentoo.org> lib/portage/package/ebuild/fetch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py index c2f7dffc0..100450792 100644 --- a/lib/portage/package/ebuild/fetch.py +++ b/lib/portage/package/ebuild/fetch.py @@ -907,8 +907,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, primaryuri_dict = {} thirdpartymirror_uris = {} for myfile, myuri in file_uri_tuples: - override_mirror = myuri.startswith("mirror+") - override_fetch = override_mirror or myuri.startswith("fetch+") + override_mirror = (myuri or "").startswith("mirror+") + override_fetch = override_mirror or (myuri or "").startswith("fetch+") if override_fetch: myuri = myuri.partition("+")[2]