diff options
| -rw-r--r-- | keymanager/changes/bug-4752_error_fetching_keys | 1 | ||||
| -rw-r--r-- | keymanager/src/leap/keymanager/__init__.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keymanager/changes/bug-4752_error_fetching_keys b/keymanager/changes/bug-4752_error_fetching_keys new file mode 100644 index 0000000..04bf1af --- /dev/null +++ b/keymanager/changes/bug-4752_error_fetching_keys @@ -0,0 +1 @@ +- Return always KeyNotFound failure if fetch keys fails on an unknown error diff --git a/keymanager/src/leap/keymanager/__init__.py b/keymanager/src/leap/keymanager/__init__.py index a1a59f5..3ef6350 100644 --- a/keymanager/src/leap/keymanager/__init__.py +++ b/keymanager/src/leap/keymanager/__init__.py @@ -230,11 +230,11 @@ class KeyManager(object): if e.response.status_code == 404: d = defer.fail(KeyNotFound(address)) else: - d = defer.fail(e) + d = defer.fail(KeyNotFound(e.message)) logger.warning("HTTP error retrieving key: %r" % (e,)) logger.warning("%s" % (res.content,)) except Exception as e: - d = defer.fail(e) + d = defer.fail(KeyNotFound(e.message)) logger.warning("Error retrieving key: %r" % (e,)) return d |