From 61ace729ada4de8e6c0e84500e70392f495dbc67 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 17 Jul 2015 16:57:47 +0200 Subject: [merge] Refer to noverify properly. --- tools/merge.py | 6 +++--- 1 file 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) -- cgit v1.1