From 19c3c83794cf351704a3ab1b0b7ef7f196ee95f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat, 29 Nov 2008 00:56:40 +0000
Subject: [PATCH]

---
 src/Hydra/root/product-list.tt      | 4 +++-
 src/Hydra/script/hydra_scheduler.pl | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Hydra/root/product-list.tt b/src/Hydra/root/product-list.tt
index f85570be..6dd264a5 100644
--- a/src/Hydra/root/product-list.tt
+++ b/src/Hydra/root/product-list.tt
@@ -28,7 +28,7 @@
           <p>The package can then be found in the path <tt>[%
           product.path %]</tt>.  You’ll probably also want to do
 
-          <pre>nix-env -i [% product.path %]</pre>
+          <pre>$ nix-env -i [% product.path %]</pre>
 
           to actually install the package in your Nix user environment.</p>
 
@@ -90,6 +90,8 @@
             “README” file
           [% CASE "manual" %]
             Manual
+          [% CASE "release-notes" %]
+            Release notes
           [% CASE DEFAULT %]
             Documentation of type <tt>[% product.subtype %]</tt>
           [% END %]
diff --git a/src/Hydra/script/hydra_scheduler.pl b/src/Hydra/script/hydra_scheduler.pl
index 7f88aa94..b8d40234 100755
--- a/src/Hydra/script/hydra_scheduler.pl
+++ b/src/Hydra/script/hydra_scheduler.pl
@@ -346,9 +346,10 @@ sub checkJobSet {
 
     # Fetch the input containing the Nix expression.
     (my $exprInput) = $jobset->jobsetinputs->search({name => $jobset->nixexprinput});
-    die unless defined $exprInput;
+    die "No input named " . $jobset->nixexprinput unless defined $exprInput;
 
-    die "not supported yet" if scalar($exprInput->jobsetinputalts) != 1;
+    die "Multiple alternatives for the Nix expression input not supported yet"
+        if scalar($exprInput->jobsetinputalts) != 1;
 
     fetchInput($exprInput, $exprInput->jobsetinputalts->first, $inputInfo);