From 80bc94506980ac588e6bb1ce5e8021be21dec2fe Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Mon, 13 Apr 2015 16:39:19 +0200
Subject: fixup! WIP

---
 test/catlfish-test-local-merge.cfg | 1 +
 tools/merge.py                     | 4 ++--
 verifycert.erl                     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg
index c4dffbb..766c872 100644
--- a/test/catlfish-test-local-merge.cfg
+++ b/test/catlfish-test-local-merge.cfg
@@ -7,3 +7,4 @@ paths:
         logpublickey: tests/keys/logkey.pem
         privatekeys: tests/privatekeys
         verifycert_bin: ../verifycert.erl
+        known_roots: tests/known_roots/
diff --git a/tools/merge.py b/tools/merge.py
index e7db16e..76ffede 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -260,8 +260,8 @@ for hash in new_entries:
             entries_to_fetch[storagenode["name"]].append(hash)
             break
 
-verifycert = subprocess.Popen(paths["verifycert_bin"],
-                               stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+verifycert = subprocess.Popen([paths["verifycert_bin"], paths["known_roots"]],
+                              stdin=subprocess.PIPE, stdout=subprocess.PIPE)
 
 added_entries = 0
 for storagenode in storagenodes:
diff --git a/verifycert.erl b/verifycert.erl
index 2d04b20..d364adf 100755
--- a/verifycert.erl
+++ b/verifycert.erl
@@ -36,6 +36,6 @@ loop(RootCerts) ->
             loop(RootCerts)
     end.
 
-main(_) ->
-    Certs = x509:read_pemfiles_from_dir("tests/known_roots/"),
+main([KnownRoots]) ->
+    Certs = x509:read_pemfiles_from_dir(KnownRoots),
     loop(Certs).
-- 
cgit v1.1