summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-09-22 22:54:11 +0200
committerLinus Nordberg <linus@nordu.net>2015-11-10 12:48:46 +0100
commita1d900e34bc73ea58c4bd1b83b5023343b2b8f01 (patch)
treeacf963e981f41761a2012362416f9d4eebb09101 /tools/merge_dist.py
parentcd8df4275c5ba27351edbb53f9a0e7314a546bab (diff)
Get the imports correct.
Diffstat (limited to 'tools/merge_dist.py')
-rw-r--r--tools/merge_dist.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/merge_dist.py b/tools/merge_dist.py
index 2b2f259..bfc0e61 100644
--- a/tools/merge_dist.py
+++ b/tools/merge_dist.py
@@ -9,9 +9,9 @@ import urllib2
import base64
import select
from certtools import timing_point, check_sth_signature, \
- get_public_key_from_file
+ create_sth_signature, get_public_key_from_file
from mergetools import get_curpos, get_logorder, chunks, get_missingentries, \
- sendsth, create_sth_signature, hexencode, sendlog, sendentry, read_chain
+ sendsth, hexencode, sendlog, sendentry, read_chain
def merge_dist(args, config, localconfig, sth_in):
paths = localconfig["paths"]