fix for issue anaconda#501

dzelge · Jul 11, 2019 · 2cb8d59 · 2cb8d59
1 parent b276f05
commit 2cb8d59
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/binstar_client/__init__.py b/binstar_client/__init__.py
@@ -215,19 +215,19 @@ def _check_response(self, res, allowed=[200]):
             except:
                 pass
             else:
-                msg = data.get('error', msg)
+                msg += '\n' + data['error'] if data.get('error', None) else ''
 
-            ErrCls = errors.BinstarError
+            ErrCls = errors.BinstarError(msg)
             if res.status_code == 401:
-                ErrCls = errors.Unauthorized
+                ErrCls = errors.Unauthorized(msg)
             elif res.status_code == 404:
-                ErrCls = errors.NotFound
+                ErrCls = errors.NotFound(msg)
             elif res.status_code == 409:
-                ErrCls = errors.Conflict
+                ErrCls = errors.Conflict(msg)
             elif res.status_code >= 500:
-                ErrCls = errors.ServerError
+                ErrCls = errors.ServerError(msg)
 
-            raise ErrCls(msg, res.status_code)
+            raise ErrCls
 
     def user(self, login=None):
         '''

diff --git a/binstar_client/scripts/cli.py b/binstar_client/scripts/cli.py
@@ -45,7 +45,7 @@ def file_or_token(value):
 
 def _custom_excepthook(logger, show_traceback=False):
     def excepthook(exc_type, exc_value, exc_traceback):
-        if issubclass(exc_type, KeyboardInterrupt) or not issubclass(exc_type, errors.ServerError):
+        if issubclass(exc_type, KeyboardInterrupt):
             return
 
         if show_traceback: