mirror of https://github.com/borgbackup/borg.git
Merge pull request #1826 from textshell/feature/repository-cleanup-rollback-api
Repository: rollback's cleanup parameter is internal.
This commit is contained in:
commit
dc4325be25
|
@ -151,7 +151,7 @@ class Repository:
|
||||||
cleanup = True
|
cleanup = True
|
||||||
else:
|
else:
|
||||||
cleanup = False
|
cleanup = False
|
||||||
self.rollback(cleanup)
|
self._rollback(cleanup=cleanup)
|
||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -437,7 +437,7 @@ class Repository:
|
||||||
free_space = st_vfs.f_bavail * st_vfs.f_bsize
|
free_space = st_vfs.f_bavail * st_vfs.f_bsize
|
||||||
logger.debug('check_free_space: required bytes {}, free bytes {}'.format(required_free_space, free_space))
|
logger.debug('check_free_space: required bytes {}, free bytes {}'.format(required_free_space, free_space))
|
||||||
if free_space < required_free_space:
|
if free_space < required_free_space:
|
||||||
self.rollback(cleanup=True)
|
self._rollback(cleanup=True)
|
||||||
formatted_required = format_file_size(required_free_space)
|
formatted_required = format_file_size(required_free_space)
|
||||||
formatted_free = format_file_size(free_space)
|
formatted_free = format_file_size(free_space)
|
||||||
raise self.InsufficientFreeSpaceError(formatted_required, formatted_free)
|
raise self.InsufficientFreeSpaceError(formatted_required, formatted_free)
|
||||||
|
@ -735,7 +735,7 @@ class Repository:
|
||||||
logger.info('Completed repository check, no problems found.')
|
logger.info('Completed repository check, no problems found.')
|
||||||
return not error_found or repair
|
return not error_found or repair
|
||||||
|
|
||||||
def rollback(self, cleanup=False):
|
def _rollback(self, *, cleanup):
|
||||||
"""
|
"""
|
||||||
"""
|
"""
|
||||||
if cleanup:
|
if cleanup:
|
||||||
|
@ -743,6 +743,9 @@ class Repository:
|
||||||
self.index = None
|
self.index = None
|
||||||
self._active_txn = False
|
self._active_txn = False
|
||||||
|
|
||||||
|
def rollback(self):
|
||||||
|
self._rollback(cleanup=False)
|
||||||
|
|
||||||
def __len__(self):
|
def __len__(self):
|
||||||
if not self.index:
|
if not self.index:
|
||||||
self.index = self.open_index(self.get_transaction_id())
|
self.index = self.open_index(self.get_transaction_id())
|
||||||
|
|
Loading…
Reference in New Issue