From c36c496507405bfcd059b1fc8b117897a6850b9a Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 14 Nov 2019 13:05:47 +0100
Subject: [PATCH] banlist: fail on unexpected errors

Also, don't output the 'already banned' error message
---
 modules/bitcoind.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index 6021993..b3baf19 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -279,9 +279,13 @@ in {
           sleep 1
         done
         echo "Importing node banlist..."
-        set +e
-        . ${./banlist.cli.txt}
-        true
+        cat ${./banlist.cli.txt} | while read line; do
+            if ! err=$(eval "$line" 2>&1) && [[ $err != *already\ banned* ]]; then
+                # unexpected error
+                echo "$err"
+                exit 1
+            fi
+        done
       '';
       serviceConfig = {
         User = "${cfg.user}";