diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-09-22 22:38:55 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-11-10 12:48:46 +0100 |
| commit | cd8df4275c5ba27351edbb53f9a0e7314a546bab (patch) | |
| tree | 107a2f2790065043924a09f91cb39b0ab3172d29 /tools | |
| parent | 2ab3e4fcf5118b4606cbb98ae5fea8bd64183dec (diff) | |
Correct two error printouts.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mergetools.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/mergetools.py b/tools/mergetools.py index 820087c..7f1b2af 100644 --- a/tools/mergetools.py +++ b/tools/mergetools.py @@ -281,14 +281,15 @@ def sendsth(node, baseurl, own_key, paths, submission): def verifyroot(node, baseurl, own_key, paths, treesize): try: result = http_request(baseurl + "plop/v1/merge/verifyroot", - json.dumps({"tree_size":treesize}), key=own_key, verifynode=node, publickeydir=paths["publickeys"]) + json.dumps({"tree_size":treesize}), key=own_key, + verifynode=node, publickeydir=paths["publickeys"]) return json.loads(result) except urllib2.HTTPError, e: print >>sys.stderr, "ERROR: verifyroot", e.read() sys.exit(1) except ValueError, e: print >>sys.stderr, "==== FAILED REQUEST ====" - print >>sys.stderr, submission + print >>sys.stderr, treesize print >>sys.stderr, "======= RESPONSE =======" print >>sys.stderr, result print >>sys.stderr, "========================" @@ -298,14 +299,15 @@ def verifyroot(node, baseurl, own_key, paths, treesize): def setverifiedsize(node, baseurl, own_key, paths, treesize): try: result = http_request(baseurl + "plop/v1/merge/setverifiedsize", - json.dumps({"size":treesize}), key=own_key, verifynode=node, publickeydir=paths["publickeys"]) + json.dumps({"size":treesize}), key=own_key, + verifynode=node, publickeydir=paths["publickeys"]) return json.loads(result) except urllib2.HTTPError, e: print >>sys.stderr, "ERROR: setverifiedsize", e.read() sys.exit(1) except ValueError, e: print >>sys.stderr, "==== FAILED REQUEST ====" - print >>sys.stderr, submission + print >>sys.stderr, treesize print >>sys.stderr, "======= RESPONSE =======" print >>sys.stderr, result print >>sys.stderr, "========================" |