summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-11-10 16:12:42 +0100
committerLinus Nordberg <linus@nordu.net>2015-11-10 16:12:42 +0100
commit0ed4ddd1920af585a404c1e203dc88d5715640c3 (patch)
tree62171945ae749001a29845a8df46fdcbe63e2de3
parent6e7f0485d8e42278942d64569c19f2b9f504e11a (diff)
Fix harmless cut'n'paste bugs in merge.
-rwxr-xr-xtools/merge_dist.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/merge_dist.py b/tools/merge_dist.py
index 20b6a06..05cffc2 100755
--- a/tools/merge_dist.py
+++ b/tools/merge_dist.py
@@ -86,8 +86,8 @@ def merge_dist(args, localconfig, frontendnodes, timestamp):
print >>sys.stderr, "missing entries:", len(missingentries)
sys.stderr.flush()
- fetched_entries = 0
- print >>sys.stderr, "fetching missing entries",
+ sent_entries = 0
+ print >>sys.stderr, "send missing entries",
sys.stderr.flush()
for missingentry in missingentries:
ehash = b64decode(missingentry)
@@ -96,9 +96,9 @@ def merge_dist(args, localconfig, frontendnodes, timestamp):
if sendentryresult["result"] != "ok":
print >>sys.stderr, "sendentry:", sendentryresult
sys.exit(1)
- fetched_entries += 1
- if fetched_entries % 1000 == 0:
- print >>sys.stderr, fetched_entries,
+ sent_entries += 1
+ if sent_entries % 1000 == 0:
+ print >>sys.stderr, sent_entries,
sys.stderr.flush()
print >>sys.stderr
sys.stderr.flush()