Revision 4a1c29ea pithos/backends/modular.py
b/pithos/backends/modular.py | ||
---|---|---|
384 | 384 |
|
385 | 385 |
if self._get_statistics(node)[0] > 0: |
386 | 386 |
raise IndexError('Container is not empty') |
387 |
hashes = self.node.node_purge_children(node, until, CLUSTER_HISTORY)
|
|
387 |
hashes = self.node.node_purge_children(node, inf, CLUSTER_HISTORY)
|
|
388 | 388 |
for h in hashes: |
389 | 389 |
self.store.map_delete(h) |
390 | 390 |
self.node.node_purge_children(node, inf, CLUSTER_DELETED) |
... | ... | |
446 | 446 |
modified = del_props[self.MTIME] |
447 | 447 |
|
448 | 448 |
meta = dict(self.node.attribute_get(props[self.SERIAL])) |
449 |
meta.update({'name': name, 'bytes': props[self.SIZE]}) |
|
449 |
meta.update({'name': name, 'bytes': props[self.SIZE], 'hash':props[self.HASH]})
|
|
450 | 450 |
meta.update({'version': props[self.SERIAL], 'version_timestamp': props[self.MTIME]}) |
451 | 451 |
meta.update({'modified': modified, 'modified_by': props[self.MUSER]}) |
452 | 452 |
return meta |
... | ... | |
623 | 623 |
hashes += self.node.node_purge(node, until, CLUSTER_HISTORY) |
624 | 624 |
for h in hashes: |
625 | 625 |
self.store.map_delete(h) |
626 |
self.node.node_purge_children(node, until, CLUSTER_DELETED)
|
|
626 |
self.node.node_purge(node, until, CLUSTER_DELETED) |
|
627 | 627 |
try: |
628 | 628 |
props = self._get_version(node) |
629 | 629 |
except NameError: |
630 |
pass |
|
631 |
else: |
|
632 | 630 |
self.permissions.access_clear(path) |
633 | 631 |
return |
634 | 632 |
|
Also available in: Unified diff