ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

* Boolean inputs.

Browse Source
This commit is contained in:
Eelco Dolstra
2008-11-25 18:34:24 +00:00
parent 1698e490d0
commit c72f4dd67a
19 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Hydra/programs/Scheduler.pl
View File

@ -162,6 +162,11 @@ sub fetchInput {
$$inputInfo{$input->name} = {type => $type, value => $alt->value};
}
elsif ($type eq "boolean") {
die unless defined $alt->value && ($alt->value eq "true" || $alt->value eq "false");
$$inputInfo{$input->name} = {type => $type, value => $alt->value};
}
else {
die "input `" . $input->name . "' has unknown type `$type'";
}
@ -285,8 +290,10 @@ sub checkJobAlternatives {
push @newArgs, "--arg", $argName,
"{path = builtins.storePath " . $inputInfo->{$argName}->{storePath} . ";" .
" rev = \"" . $inputInfo->{$argName}->{revision} . "\";}";
} elsif (defined $inputInfo->{$argName}->{value}) {
} elsif ($inputInfo->{$argName}->{type} eq "string") {
push @newArgs, "--argstr", $argName, $inputInfo->{$argName}->{value};
} elsif ($inputInfo->{$argName}->{type} eq "boolean") {
push @newArgs, "--arg", $argName, $inputInfo->{$argName}->{value};
}
checkJobAlternatives(
$project, $jobset, $inputInfo, $nixExprPath,
@ -382,7 +389,10 @@ sub checkJobSet {
$project, $jobset, {}, $nixExprPath,
$jobName, $jobExpr, [], \@argsNeeded, 0);
};
warn $@ if $@;
if ($@) {
print "error checking job ", $jobName, ": $@";
setJobsetError($jobset, $@);
}
}
}