Skip to content

Commit 35c371f

Browse files
committed
Fixed #222 -- CLI scaling error msg when no Rackspace image exists
1 parent 8f291f1 commit 35c371f

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

api/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ def scale(self, request, **kwargs):
174174
formation = self.get_object()
175175
try:
176176
databag = models.Node.objects.scale(formation, new_structure)
177-
except models.Layer.DoesNotExist as e:
178-
return Response(str(e), status=status.HTTP_400_BAD_REQUEST)
177+
except (models.Layer.DoesNotExist, EnvironmentError) as err:
178+
return Response(str(err), status=status.HTTP_400_BAD_REQUEST)
179179
return Response(databag, status=status.HTTP_200_OK,
180180
content_type='application/json')
181181

client/deis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1823,7 +1823,7 @@ def main():
18231823
except ResponseError as err:
18241824
resp = err.message
18251825
print('{} {}'.format(resp.status_code, resp.reason))
1826-
print(resp.text)
1826+
print(resp.json() or resp.text)
18271827
sys.exit(1)
18281828

18291829

0 commit comments

Comments
 (0)