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 C3C2A138334 for ; Mon, 14 Oct 2019 20:13:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19AD2E09EC; Mon, 14 Oct 2019 20:13:09 +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 0411CE09EC for ; Mon, 14 Oct 2019 20:13:08 +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 BAD7E34BD14 for ; Mon, 14 Oct 2019 20:13:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1391777D for ; Mon, 14 Oct 2019 20:13:06 +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: <1571083900.7c0fd425fd33a75dc8978b5d9ef6d4bd7f8a31bc.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: 7c0fd425fd33a75dc8978b5d9ef6d4bd7f8a31bc X-VCS-Branch: master Date: Mon, 14 Oct 2019 20:13:06 +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: 196ab4b7-69fa-473b-a5ea-c1023c98090c X-Archives-Hash: 732569beffafd9d99caa6e9827c1dacb commit: 7c0fd425fd33a75dc8978b5d9ef6d4bd7f8a31bc Author: Zac Medico gentoo org> AuthorDate: Mon Oct 14 20:10:41 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 14 20:11:40 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7c0fd425 get_mirror_url: handle UnicodeDecodeError Fixes: 6a539b7c5163 ("fetch: Support GLEP 75 mirror structure") 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 1d5e07260..4e67dff97 100644 --- a/lib/portage/package/ebuild/fetch.py +++ b/lib/portage/package/ebuild/fetch.py @@ -419,7 +419,7 @@ def get_mirror_url(mirror_url, filename, cache_path=None): mirror_conf.read_from_file(data) except ConfigParserError: pass - except IOError: + except (IOError, UnicodeDecodeError): pass cache[mirror_url] = (time.time(), mirror_conf.serialize())