Skip to content

Commit dcff101

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "fix multiple server delete produce multiple new lines"
2 parents dd1118e + 7276610 commit dcff101

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

openstackclient/compute/v2/server.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -999,13 +999,9 @@ def _show_progress(progress):
999999
compute_client.servers, server)
10001000
compute_client.servers.delete(server_obj.id)
10011001
if parsed_args.wait:
1002-
if utils.wait_for_delete(
1003-
compute_client.servers,
1004-
server_obj.id,
1005-
callback=_show_progress,
1006-
):
1007-
self.app.stdout.write('\n')
1008-
else:
1002+
if not utils.wait_for_delete(compute_client.servers,
1003+
server_obj.id,
1004+
callback=_show_progress):
10091005
LOG.error(_('Error deleting server: %s'),
10101006
server_obj.id)
10111007
self.app.stdout.write(_('Error deleting server\n'))

0 commit comments

Comments
 (0)