external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-21 03:02:09 +00:00
Code Issues Releases Wiki Activity

Add trailing slash when checking a remote backup. Also check if we actually can read the remote size

Browse Source
This commit is contained in:
Michael Kroes 2016-07-16 11:25:39 +02:00
parent 6b334d1e07
commit e069eb9940
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
management/backup.py
View File

@ -101,7 +101,7 @@ def backup_status(env):
# onto. Round up since the backup occurs on the night following # onto. Round up since the backup occurs on the night following
# when the threshold is met. # when the threshold is met.
deleted_in = None deleted_in = None
if incremental_count > 0 and first_full_size is not None: if incremental_count > 0 and first_full_size is not None and incremental_size > 0:
deleted_in = "approx. %d days" % round(config["min_age_in_days"] + (.5 * first_full_size - incremental_size) / (incremental_size/incremental_count) + .5) deleted_in = "approx. %d days" % round(config["min_age_in_days"] + (.5 * first_full_size - incremental_size) / (incremental_size/incremental_count) + .5)
# When will a backup be deleted? # When will a backup be deleted?
@ -369,6 +369,8 @@ def list_target_files(config):
_, target_host, target_path = config['target'].split('//') _, target_host, target_path = config['target'].split('//')
target_path = '/' + target_path target_path = '/' + target_path
if not target_path.endswith('/'):
target_path += '/'
rsync_command = [ 'rsync', rsync_command = [ 'rsync',
'-e', '-e',