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 DAE0B138334 for ; Mon, 14 Oct 2019 20:45:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE66EE09AD; Mon, 14 Oct 2019 20:45:47 +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 A07FFE09AD for ; Mon, 14 Oct 2019 20:45:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 521A234BD27 for ; Mon, 14 Oct 2019 20:45:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D36AE77D for ; Mon, 14 Oct 2019 20:45:43 +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: <1571085509.76fd5593d8ddf446f445ba3dd9da18a6e44dc5b3.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: 76fd5593d8ddf446f445ba3dd9da18a6e44dc5b3 X-VCS-Branch: master Date: Mon, 14 Oct 2019 20:45:43 +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: a3dc23a1-1854-4742-87e6-12f3883c5b62 X-Archives-Hash: 2e9240068ebcafc7164f588330b40c75 commit: 76fd5593d8ddf446f445ba3dd9da18a6e44dc5b3 Author: Zac Medico gentoo org> AuthorDate: Mon Oct 14 20:37:25 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 14 20:38:29 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=76fd5593 get_mirror_url: do not cache after ConfigParserError Bug: https://bugs.gentoo.org/697566 Signed-off-by: Zac Medico gentoo.org> lib/portage/package/ebuild/fetch.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py index 107fba50e..debab38a2 100644 --- a/lib/portage/package/ebuild/fetch.py +++ b/lib/portage/package/ebuild/fetch.py @@ -415,11 +415,8 @@ def get_mirror_url(mirror_url, filename, cache_path=None): finally: f.close() - try: - mirror_conf.read_from_file(data) - except ConfigParserError: - pass - except (IOError, UnicodeDecodeError): + mirror_conf.read_from_file(data) + except (ConfigParserError, IOError, UnicodeDecodeError): # Do not cache negative results. cache_path = None