summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-07-17 16:57:47 +0200
committerLinus Nordberg <linus@nordu.net>2015-07-17 16:57:47 +0200
commit61ace729ada4de8e6c0e84500e70392f495dbc67 (patch)
tree42f3c78bc74b95ad03be8510ae1549166b37559f
parentced92647d19d7ef66e5c27f8e54cc62d1668c7e2 (diff)
[merge] Refer to noverify properly.
-rwxr-xr-xtools/merge.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/merge.py b/tools/merge.py
index 6e95206..db9886b 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -224,7 +224,7 @@ for hash in new_entries:
entries_to_fetch[storagenode["name"]].append(hash)
break
-if not noverify:
+if not args.noverify:
verifycert = subprocess.Popen([paths["verifycert_bin"], paths["known_roots"]],
stdin=subprocess.PIPE, stdout=subprocess.PIPE)
@@ -236,7 +236,7 @@ for storagenode in storagenodes:
entries = get_entries(storagenode["name"], "https://%s/" % storagenode["address"], chunk)
for hash in chunk:
entry = entries[hash]
- if not noverify:
+ if not args.noverify:
verify_entry(verifycert, entry, hash)
write_chain(hash, entry)
add_to_logorder(hash)
@@ -252,7 +252,7 @@ timing_point(timing, "add entries")
print >>sys.stderr, "added", added_entries, "entries"
sys.stderr.flush()
-if not noverify:
+if not args.noverify:
verifycert.communicate(struct.pack("I", 0))
tree = build_merkle_tree(logorder)