openstack/python-swiftclient
Code Issues Proposed changes

Fix printed object names on successful bulk-delete

Browse Source 
Replace the 1 always concatenated to printed object names for each
successfully deleted object in bulk-delete with an optional [after x
attempts] if x > 1

Change-Id: If4af9141fe4f3436a4e9e0e2dfc24c6ec7292996
Closes-Bug: 1852808
This commit is contained in:
Sébastien Blaisot
2019-11-15 22:37:38 +01:00
parent c4bef14fc1
commit 709ab385c6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
swiftclient/shell.py
View File

@@ -169,7 +169,8 @@ def st_delete(parser, args, output_manager, return_parser=False):
for r in del_iter: for r in del_iter:
c = r.get('container', '') c = r.get('container', '')
o = r.get('object', '') o = r.get('object', '')
a = r.get('attempts') a = (' [after {0} attempts]'.format(r.get('attempts'))
if r.get('attempts') > 1 else '')
if r['action'] == 'bulk_delete': if r['action'] == 'bulk_delete':
if r['success']: if r['success']:
@@ -202,9 +203,6 @@ def st_delete(parser, args, output_manager, return_parser=False):
else: else:
if r['success']: if r['success']:
if options['verbose']: if options['verbose']:
a = (' [after {0} attempts]'.format(a)
if a > 1 else '')
if r['action'] == 'delete_object': if r['action'] == 'delete_object':
if options['yes_all']: if options['yes_all']:
p = '{0}/{1}'.format(c, o) p = '{0}/{1}'.format(c, o)