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

---
 packaging/docker/catlfish-dev/merge.sh | 2 ++
 tools/merge.py                         | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packaging/docker/catlfish-dev/merge.sh b/packaging/docker/catlfish-dev/merge.sh
index b3658cd..304d8a4 100755
--- a/packaging/docker/catlfish-dev/merge.sh
+++ b/packaging/docker/catlfish-dev/merge.sh
@@ -12,6 +12,8 @@ DBDIR="$3"
 [ -d $DBDIR/chains ] || mkdir $DBDIR/chains
 [ -e $DBDIR/logorder ] || touch $DBDIR/logorder
 
+echo "merge: ERL_LIBS: $ERL_LIBS"
+
 date
 echo "merge: waiting $(expr $S1 / 60)m$(expr $S1 % 60)s before merging for the first time"
 sleep $S1
diff --git a/tools/merge.py b/tools/merge.py
index 23b0d48..e7db16e 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -229,8 +229,7 @@ def verify_entry(verifycert, entry, hash):
     try:
         verifycert.stdin.write(s)
     except IOError, e:
-        sys.stderr.write("e = " + repr(e))
-        sys.stderr.write("merge: unable to write to verifycert: ")
+        sys.stderr.write("merge: unable to write to verifycert process: ")
         while 1:
             line = verifycert.stdout.readline()
             if line:
-- 
cgit v1.1