openstack/python-openstackclient
Code Issues Proposed changes

Merge "fix multiple server delete produce multiple new lines"

Browse Source
This commit is contained in:
Zuul 2019-01-16 22:39:56 +00:00 committed by Gerrit Code Review
commit dcff1012fd
1 changed files with 3 additions and 7 deletions

10
openstackclient/compute/v2/server.py

@ -999,13 +999,9 @@ class DeleteServer(command.Command):
compute_client.servers, server) compute_client.servers, server)
compute_client.servers.delete(server_obj.id) compute_client.servers.delete(server_obj.id)
if parsed_args.wait: if parsed_args.wait:
if utils.wait_for_delete( if not utils.wait_for_delete(compute_client.servers,
compute_client.servers, server_obj.id,
server_obj.id, callback=_show_progress):
callback=_show_progress,
):
self.app.stdout.write('\n')
else:
LOG.error(_('Error deleting server: %s'), LOG.error(_('Error deleting server: %s'),
server_obj.id) server_obj.id)
self.app.stdout.write(_('Error deleting server\n')) self.app.stdout.write(_('Error deleting server\n'))