delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* added jar to 'contents' list

Browse source
This commit is contained in:
Rob Vermaas 2009-06-18 13:23:04 +00:00
parent e457be469c
commit 1da4f89eae
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/Hydra/Controller/Build.pm
View file

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