beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

additional error handling for backups with an invalid target

Browse source
This commit is contained in:
Joshua Tauberer 2015-08-12 11:19:59 +00:00
parent bded529535
commit 848dea83ab
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
management/backup.py
View file

@ -53,7 +53,7 @@ def backup_status(env):
"size": 0, # collection-status doesn't give us the size
"volumes": keys[2], # number of archive volumes for this backup (not really helpful)
}
collection_status = shell('check_output', [
code, collection_status = shell('check_output', [
"/usr/bin/duplicity",
"collection-status",
"--archive-dir", backup_cache_dir,
@ -61,7 +61,12 @@ def backup_status(env):
"--log-fd", "1",
config["target"],
],
get_env(env))
get_env(env),
trap=True)
if code != 0:
# Command failed. This is likely due to an improperly configured remote
# destination for the backups.
return { }
for line in collection_status.split('\n'):
if line.startswith(" full") or line.startswith(" inc"):
backup = parse_line(line)