commit: 76fd5593d8ddf446f445ba3dd9da18a6e44dc5b3 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Oct 14 20:37:25 2019 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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 <zmedico <AT> 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
