From 2fd16de0f29487b4b55d50631daf728953336db8 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Thu, 1 Dec 2016 13:09:53 +0100
Subject: Separate two error cases when reading 'verified' file.

---
 tools/merge_sth.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/merge_sth.py b/tools/merge_sth.py
index 9dd7a70..c4220dc 100755
--- a/tools/merge_sth.py
+++ b/tools/merge_sth.py
@@ -47,8 +47,13 @@ def merge_sth(args, config, localconfig):
         verifiedfile = mergedb + "/verified." + mergenode["name"]
         try:
             tree = json.loads(open(verifiedfile, "r").read())
-        except (IOError, ValueError):
+        except IOError:
             tree = {'tree_size': 0, "sha256_root_hash": ''}
+        except ValueError:
+            logging.error("corrupt verified file %s", verifiedfile)
+            return -1
+        logging.debug("adding tree_size %d from %s to trees", tree['tree_size'],
+                      verifiedfile)
         trees.append(tree)
     trees.sort(key=lambda e: e['tree_size'], reverse=True)
     logging.debug("trees: %s", trees)
-- 
cgit v1.1