summaryrefslogtreecommitdiff
path: root/tools/mergetools.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2016-11-18 17:13:31 +0100
committerMagnus Ahltorp <map@kth.se>2016-11-18 17:13:31 +0100
commitaa7be9990183d6e9a87037b88a1e33dca35304e3 (patch)
treebf496efbb11fe23d23597340a7ffe237d87b9fbb /tools/mergetools.py
parentb48c1689e36bdcc65a34b4ab12763478b072a716 (diff)
Use sessions in merge_fetch
Diffstat (limited to 'tools/mergetools.py')
-rw-r--r--tools/mergetools.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mergetools.py b/tools/mergetools.py
index ff3d08c..94901a9 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -179,13 +179,13 @@ def get_new_entries(node, baseurl, own_key, paths):
print >>sys.stderr, "ERROR: fetchnewentries", e.response
sys.exit(1)
-def get_entries(node, baseurl, own_key, paths, hashes):
+def get_entries(node, baseurl, own_key, paths, hashes, session=None):
try:
params = {"hash":[base64.b64encode(ehash) for ehash in hashes]}
result = http_request(baseurl + "plop/v1/storage/getentry",
params=params,
key=own_key, verifynode=node,
- publickeydir=paths["publickeys"])
+ publickeydir=paths["publickeys"], session=session)
parsed_result = json.loads(result)
if parsed_result.get(u"result") == u"ok":
entries = dict([(base64.b64decode(entry["hash"]),