Revision 2d8e6f94 snf-pithos-backend/pithos/backends/modular.py
| b/snf-pithos-backend/pithos/backends/modular.py | ||
|---|---|---|
| 490 | 490 |
self.node.node_purge_children(node, until, CLUSTER_DELETED) |
| 491 | 491 |
self._report_size_change(user, account, -size, |
| 492 | 492 |
{'action':'container purge', 'path': path,
|
| 493 |
'versions': serials})
|
|
| 493 |
'versions': ','.join(str(i) for i in serials)})
|
|
| 494 | 494 |
return |
| 495 | 495 |
|
| 496 | 496 |
if not delimiter: |
| ... | ... | |
| 505 | 505 |
self._report_size_change(user, account, -size, |
| 506 | 506 |
{'action': 'container delete',
|
| 507 | 507 |
'path': path, |
| 508 |
'versions': serials})
|
|
| 508 |
'versions': ','.join(str(i) for i in serials)})
|
|
| 509 | 509 |
else: |
| 510 | 510 |
# remove only contents |
| 511 | 511 |
src_names = self._list_objects_no_limit(user, account, container, prefix='', delimiter=None, virtual=False, domain=None, keys=[], shared=False, until=None, size_range=None, all_props=True, public=False) |
| ... | ... | |
| 519 | 519 |
if del_size: |
| 520 | 520 |
self._report_size_change(user, account, -del_size, |
| 521 | 521 |
{'action': 'object delete',
|
| 522 |
'path': path, 'versions': [dest_version_id]}) |
|
| 522 |
'path': path, |
|
| 523 |
'versions': ','.join([str(dest_version_id)])}) |
|
| 523 | 524 |
self._report_object_change( |
| 524 | 525 |
user, account, path, details={'action': 'object delete'})
|
| 525 | 526 |
paths.append(path) |
| ... | ... | |
| 811 | 812 |
raise QuotaError |
| 812 | 813 |
self._report_size_change(user, account, size_delta, |
| 813 | 814 |
{'action': 'object update', 'path': path,
|
| 814 |
'versions': [dest_version_id]})
|
|
| 815 |
'versions': ','.join([str(dest_version_id)])})
|
|
| 815 | 816 |
|
| 816 | 817 |
if permissions is not None: |
| 817 | 818 |
self.permissions.access_set(path, permissions) |
| ... | ... | |
| 943 | 944 |
self.permissions.access_clear(path) |
| 944 | 945 |
self._report_size_change(user, account, -size, |
| 945 | 946 |
{'action': 'object purge', 'path': path,
|
| 946 |
'versions': serials})
|
|
| 947 |
'versions': ','.join(str(i) for i in serials)})
|
|
| 947 | 948 |
return |
| 948 | 949 |
|
| 949 | 950 |
path, node = self._lookup_object(account, container, name) |
| ... | ... | |
| 952 | 953 |
if del_size: |
| 953 | 954 |
self._report_size_change(user, account, -del_size, |
| 954 | 955 |
{'action': 'object delete', 'path': path,
|
| 955 |
'versions': [dest_version_id]})
|
|
| 956 |
'versions': ','.join([str(dest_version_id)])})
|
|
| 956 | 957 |
self._report_object_change( |
| 957 | 958 |
user, account, path, details={'action': 'object delete'})
|
| 958 | 959 |
self.permissions.access_clear(path) |
| ... | ... | |
| 971 | 972 |
self._report_size_change(user, account, -del_size, |
| 972 | 973 |
{'action': 'object delete',
|
| 973 | 974 |
'path': path, |
| 974 |
'versions': [dest_version_id]})
|
|
| 975 |
'versions': ','.join([str(dest_version_id)])})
|
|
| 975 | 976 |
self._report_object_change( |
| 976 | 977 |
user, account, path, details={'action': 'object delete'})
|
| 977 | 978 |
paths.append(path) |
Also available in: Unified diff