From 7b7c3f226590ed4370fa3f7575ec579fbff09e02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 26 Mar 2009 15:32:19 +0000
Subject: [PATCH] * Perl sucks.  "getBuildLog $drvPath" doesn't mean the same
 as   "getBuildLog($drvPath)" if you call it in a hash, and quietly screws  
 up the rest of the hash.

---
 src/script/hydra_build.pl | 7 +------
 src/sql/hydra.sql         | 7 +++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/script/hydra_build.pl b/src/script/hydra_build.pl
index 7ecc184e..555f0145 100755
--- a/src/script/hydra_build.pl
+++ b/src/script/hydra_build.pl
@@ -32,9 +32,6 @@ sub doBuild {
 
     my $errormsg = undef;
 
-    my $failedDepBuild;
-    my $failedDepStepNr;
-    
     if (!isValidPath($outPath)) {
         $isCachedBuild = 0;
 
@@ -185,11 +182,9 @@ sub doBuild {
             , buildstatus => $buildStatus
             , starttime => $startTime
             , stoptime => $stopTime
-            , logfile => getBuildLog $drvPath
+            , logfile => getBuildLog($drvPath)
             , errormsg => $errormsg
             , releasename => $releaseName
-            , faileddepbuild => $failedDepBuild
-            , faileddepstepnr => $failedDepStepNr
             });
 
         if ($buildStatus == 0) {
diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 9d0fc528..2a9a474b 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -63,7 +63,7 @@ create table BuildResultInfo (
     --   2 = build of some dependency failed
     --   3 = other failure (see errorMsg)
     --   4 = build cancelled (removed from queue; never built)
-    --   5 = build not done because a dependency failed previously
+    --   5 = build not done because a dependency failed previously (obsolete)
     buildStatus   integer,
 
     errorMsg      text, -- error message in case of a Nix failure
@@ -77,9 +77,8 @@ create table BuildResultInfo (
 
     keep          integer not null default 0, -- true means never garbage-collect the build output
 
-    -- If buildStatus == 5, the primary key of the failed build step.
-    failedDepBuild  integer,
-    failedDepStepNr integer,
+    failedDepBuild  integer, -- obsolete
+    failedDepStepNr integer, -- obsolete
     
     foreign key   (id) references Builds(id) on delete cascade -- ignored by sqlite
 );