From 113a312f6717ae81327b4d5bb91a16ae06e0933e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 3 Mar 2020 22:32:13 -0500
Subject: [PATCH] handleDeclarativeJobsetBuild: handle errors from readNixFile

---
 src/lib/Hydra/Helper/AddBuilds.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index 40375c6b..296afbc5 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -68,8 +68,14 @@ sub handleDeclarativeJobsetBuild {
         my $id = $build->id;
         die "Declarative jobset build $id failed" unless $build->buildstatus == 0;
         my $declPath = ($build->buildoutputs)[0]->path;
-        my $declText = readNixFile($declPath)
-            or die "Couldn't read declarative specification file $declPath: $!";
+        my $declText = eval {
+            readNixFile($declPath)
+        };
+        if ($@) {
+            print STDERR "ERROR: failed to readNixFile $declPath: ", $@, "\n";
+            die;
+        }
+
         my $declSpec = decode_json($declText);
         txn_do($db, sub {
             my @kept = keys %$declSpec;