From ba9065cada64d23963403400fd9f57ceebe99d2d Mon Sep 17 00:00:00 2001 From: Leo Koppelkamm Date: Mon, 27 Jul 2015 22:30:22 +0200 Subject: [PATCH] Don't write collection_status output to file but parse it directly --- management/backup.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/management/backup.py b/management/backup.py index 3cccf1ff..3a7a29cc 100755 --- a/management/backup.py +++ b/management/backup.py @@ -46,7 +46,7 @@ def backup_status(env): if rd.days > 1: return "%d days, %d hours" % (rd.days, rd.hours) if rd.days == 1: return "%d day, %d hours" % (rd.days, rd.hours) return "%d hours, %d minutes" % (rd.hours, rd.minutes) - + def parse_line(line): keys = line.strip().split() date = dateutil.parser.parse(keys[1]) @@ -57,28 +57,28 @@ def backup_status(env): "full": keys[0] == "full", "size": int(keys[2]) * 250 * 1000000, } - - # Write duplicity status to file - shell('check_call', [ + + # Get duplicity collection status + collection_status = shell('check_output', [ "/usr/bin/duplicity", "collection-status", "--archive-dir", backup_cache_dir, "--log-file", os.path.join(backup_root, "duplicity_status"), "--gpg-options", "--cipher-algo=AES256", + "--log-fd", "1", config["target"], ], get_env()) - # Parse backup data from status file - with open(os.path.join(backup_root, "duplicity_status"),'r') as status_file: - for line in status_file: - if line.startswith(" full") or line.startswith(" inc"): - backup = parse_line(line) - backups[backup["date"]] = backup + # Split multi line string into list + collection_status = collection_status.split('\n') + + # Parse backup data from status file + for line in collection_status: + if line.startswith(" full") or line.startswith(" inc"): + backup = parse_line(line) + backups[backup["date"]] = backup - # Remove status file - os.remove(os.path.join(backup_root, "duplicity_status")) - # Ensure the rows are sorted reverse chronologically. # This is relied on by should_force_full() and the next step. backups = sorted(backups.values(), key = lambda b : b["date"], reverse=True)