From 1da4f89eae19d099516fabf92f496aa3e16e65f1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 18 Jun 2009 13:23:04 +0000
Subject: [PATCH]  * added jar to 'contents' list

---
 src/lib/Hydra/Controller/Build.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 9d857874..10a8a4a5 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -202,7 +202,7 @@ sub contents : Chained('build') PathPart Args(1) {
         error($c, "`tar' error: $?") if $? != 0;
     }
 
-    elsif ($path =~ /\.zip$/ ) {
+    elsif ($path =~ /\.(zip|jar)$/ ) {
         $res = `unzip -v "$path"`;
         error($c, "`unzip' error: $?") if $? != 0;
     }
@@ -276,7 +276,8 @@ sub restart : Chained('build') PathPart Args(0) {
     txn_do($c->model('DB')->schema, sub {
         error($c, "This build cannot be restarted.")
             unless $build->finished &&
-              ($build->resultInfo->buildstatus == 3 ||
+              ($build->resultInfo->buildstatus == 2 ||
+               $build->resultInfo->buildstatus == 3 ||
                $build->resultInfo->buildstatus == 4);
 
         $build->update({finished => 0, timestamp => time});