From db211ec8e6c566f7517aa58acc6e8456a3362bbd Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Oct 02 2018 13:32:59 +0000 Subject: [PATCH 1/2] Don't retry if certificate is not readable Fixes: https://pagure.io/koji/issue/1108 --- diff --git a/koji/__init__.py b/koji/__init__.py index 823ebcf..c5795b3 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1931,9 +1931,10 @@ def is_requests_cert_error(e): # Using str(e) is slightly ugly, but the error stacks in python-requests # are way more ugly. errstr = str(e) - if ('certificate revoked' in errstr or - 'certificate expired' in errstr or - 'certificate verify failed' in errstr): + if ('Permission denied' in errstr or # certificate not readable + 'certificate revoked' in errstr or + 'certificate expired' in errstr or + 'certificate verify failed' in errstr): return True return False From a6a6b17bc818be51e5f8ec36c8f112e2c93a7008 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Oct 18 2018 12:17:22 +0000 Subject: [PATCH 2/2] fix comment indentation for flake8 --- diff --git a/koji/__init__.py b/koji/__init__.py index c5795b3..bc40a98 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1931,7 +1931,7 @@ def is_requests_cert_error(e): # Using str(e) is slightly ugly, but the error stacks in python-requests # are way more ugly. errstr = str(e) - if ('Permission denied' in errstr or # certificate not readable + if ('Permission denied' in errstr or # certificate not readable 'certificate revoked' in errstr or 'certificate expired' in errstr or 'certificate verify failed' in errstr):