summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-16 22:39:56 +0000
committerGerrit Code Review <review@openstack.org>2019-01-16 22:39:56 +0000
commitdcff1012fd979f25028052147883bd709b825ea1 (patch)
tree4e60c45a7a7163d7180c76ae096636ebd63c97d6
parentdd1118e9660d4f772fcc0f99c8a26698d364cf84 (diff)
parent7276610595499ab45872d1b0587effc3dba195e2 (diff)
downloadpython-openstackclient-dcff1012fd979f25028052147883bd709b825ea1.tar.gz
Merge "fix multiple server delete produce multiple new lines"
-rw-r--r--openstackclient/compute/v2/server.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 3534fc7d..b608ecbd 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -999,13 +999,9 @@ class DeleteServer(command.Command):
compute_client.servers, server)
compute_client.servers.delete(server_obj.id)
if parsed_args.wait:
- if utils.wait_for_delete(
- compute_client.servers,
- server_obj.id,
- callback=_show_progress,
- ):
- self.app.stdout.write('\n')
- else:
+ if not utils.wait_for_delete(compute_client.servers,
+ server_obj.id,
+ callback=_show_progress):
LOG.error(_('Error deleting server: %s'),
server_obj.id)
self.app.stdout.write(_('Error deleting server\n'))