Skip to content

Commit affe2d5

Browse files
author
Matthew Fisher
committed
Merge pull request #1453 from deis/1448-json-error
fix(client): remove check for error message
2 parents aed6d19 + 33ba354 commit affe2d5

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

client/deis.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,6 @@ def _dispatch(self, method, path, body=None, **kwargs):
377377
'No active controller. Use `deis login` or `deis register` to get started.')
378378
url = urlparse.urljoin(controller, path, **kwargs)
379379
response = func(url, data=body, headers=headers)
380-
# check for errors
381-
if response.json().get('error') is not None:
382-
print(response.json()['error'])
383-
sys.exit(1)
384380
return response
385381

386382
def apps(self, args):

controller/api/middleware.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def process_request(self, request):
1515
server_version = __version__.rsplit('.', 1)[0]
1616
if client_version != server_version:
1717
message = {
18-
'error': 'Client and server versions do not match.\n' +
19-
'Client version: {}\n'.format(client_version) +
18+
'error': 'Client and server versions do not match. ' +
19+
'Client version: {} '.format(client_version) +
2020
'Server version: {}'.format(server_version)
2121
}
2222
return HttpResponse(

0 commit comments

Comments
 (0)