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

Better fix for dots in jobset names

Browse source
This commit is contained in:
Eelco Dolstra 2015-11-17 11:31:11 +01:00
parent ea80a75204
commit 8f7614030e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ sub parseJobName {
our $key; our $key;
our %attrs = (); our %attrs = ();
# hm, maybe I should stop programming Perl before it's too late... # hm, maybe I should stop programming Perl before it's too late...
$s =~ / ^ (?: (?: ([\w\-]+) : )? ([\w\-\.]+) : )? ([\w\-\.]+) \s* $s =~ / ^ (?: (?: ($projectNameRE) : )? ($jobsetNameRE) : )? ($jobNameRE) \s*
(\[ \s* ( (\[ \s* (
([\w]+) (?{ $key = $^N; }) \s* = \s* \" ([\w]+) (?{ $key = $^N; }) \s* = \s* \"
([\w\-]+) (?{ $attrs{$key} = $^N; }) \" ([\w\-]+) (?{ $attrs{$key} = $^N; }) \"
@ -327,7 +327,7 @@ sub evalJobs {
my ($inputInfo, $exprType, $nixExprInputName, $nixExprPath) = @_; my ($inputInfo, $exprType, $nixExprInputName, $nixExprPath) = @_;
my $nixExprInput = $inputInfo->{$nixExprInputName}->[0] my $nixExprInput = $inputInfo->{$nixExprInputName}->[0]
or die "cannot find the input containing the job expression.\n"; or die "cannot find the input containing the job expression\n";
die "multiple alternatives for the input containing the Nix expression are not supported.\n" die "multiple alternatives for the input containing the Nix expression are not supported.\n"
if scalar @{$inputInfo->{$nixExprInputName}} != 1; if scalar @{$inputInfo->{$nixExprInputName}} != 1;
my $nixExprFullPath = $nixExprInput->{storePath} . "/" . $nixExprPath; my $nixExprFullPath = $nixExprInput->{storePath} . "/" . $nixExprPath;