snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Warn against multiple jobs with the same name

Browse source
This commit is contained in:
Eelco Dolstra 2013-09-25 15:30:59 +02:00
parent da5824e11c
commit a8db329839
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lib/Hydra/Helper/AddBuilds.pm
View file

@ -282,7 +282,16 @@ sub evalJobs {
SuppressEmpty => '') SuppressEmpty => '')
or die "cannot parse XML output"; or die "cannot parse XML output";
return ($jobs, $nixExprInput); my %jobNames;
my $errors;
foreach my $job (@{$jobs->{job}}) {
$jobNames{$job->{jobName}}++;
if ($jobNames{$job->{jobName}} == 2) {
$errors .= "warning: there are multiple jobs named ‘$job->{jobName}’; support for this will go away soon!\n\n";
}
}
return ($jobs, $nixExprInput, $errors);
} }

3
src/script/hydra-evaluator
View file

@ -133,7 +133,7 @@ sub checkJobsetWrapped {
# Evaluate the job expression. # Evaluate the job expression.
my $evalStart = time; my $evalStart = time;
my ($jobs, $nixExprInput) = evalJobs($inputInfo, $exprType, $jobset->nixexprinput, $jobset->nixexprpath); my ($jobs, $nixExprInput, $msg) = evalJobs($inputInfo, $exprType, $jobset->nixexprinput, $jobset->nixexprpath);
my $evalStop = time; my $evalStop = time;
my $jobOutPathMap = {}; my $jobOutPathMap = {};
@ -238,7 +238,6 @@ sub checkJobsetWrapped {
}); });
# Store the error messages for jobs that failed to evaluate. # Store the error messages for jobs that failed to evaluate.
my $msg = "";
foreach my $error (@{$jobs->{error}}) { foreach my $error (@{$jobs->{error}}) {
my $bindings = ""; my $bindings = "";
foreach my $arg (@{$error->{arg}}) { foreach my $arg (@{$error->{arg}}) {