From b1d0d1bf04c7cb49d1e80eaac73886cf4ad5b1dc Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Tue, 15 Mar 2016 13:55:51 +0100 Subject: bugfix: re-added fetched_entries --- tools/merge_backup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/merge_backup.py b/tools/merge_backup.py index 0c283e5..48ac133 100755 --- a/tools/merge_backup.py +++ b/tools/merge_backup.py @@ -113,6 +113,7 @@ def merge_backup(args, config, localconfig, secondaries): print >>sys.stderr, "missing entries:", len(missingentries) sys.stderr.flush() + fetched_entries = 0 print >>sys.stderr, "fetching missing entries", sys.stderr.flush() with requests.sessions.Session() as session: @@ -125,6 +126,7 @@ def merge_backup(args, config, localconfig, secondaries): if sendentryresult["result"] != "ok": print >>sys.stderr, "sendentry_merge:", sendentryresult sys.exit(1) + fetched_entries += len(missingentry_hashes) print >>sys.stderr, fetched_entries, sys.stderr.flush() print >>sys.stderr -- cgit v1.1