diff options
| author | Magnus Ahltorp <map@kth.se> | 2016-11-02 03:34:35 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2016-11-02 03:34:35 +0100 |
| commit | b4dc2c37be0ed51b629e91f4d3e1dfc44cb192c0 (patch) | |
| tree | 7e23a5a48cda58be955be3b7fd7eb4ea221640d2 /tools/merge_backup.py | |
| parent | fd355ccea0227f32f49733a856103d02226be57a (diff) | |
Send list of entries to frontend
Handle connection error
Diffstat (limited to 'tools/merge_backup.py')
| -rwxr-xr-x | tools/merge_backup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/merge_backup.py b/tools/merge_backup.py index abe9f36..05679a1 100755 --- a/tools/merge_backup.py +++ b/tools/merge_backup.py @@ -124,7 +124,7 @@ def merge_backup(args, config, localconfig, secondaries): own_key, paths, hashes_and_entries, session) if sendentryresult["result"] != "ok": - print >>sys.stderr, "sendentry_merge:", sendentryresult + print >>sys.stderr, "sendentries_merge:", sendentryresult sys.exit(1) fetched_entries += len(missingentry_hashes) print >>sys.stderr, fetched_entries, |