From 8f7614030e6950f389e04d8077e7793cde1e6305 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Nov 2015 11:31:11 +0100
Subject: [PATCH] Better fix for dots in jobset names

---
 src/lib/Hydra/Helper/AddBuilds.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index 0c4508d7..cd3ba298 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -34,7 +34,7 @@ sub parseJobName {
     our $key;
     our %attrs = ();
     # hm, maybe I should stop programming Perl before it's too late...
-    $s =~ / ^ (?: (?: ([\w\-]+) : )? ([\w\-\.]+) : )? ([\w\-\.]+) \s*
+    $s =~ / ^ (?: (?: ($projectNameRE) : )? ($jobsetNameRE) : )? ($jobNameRE) \s*
             (\[ \s* (
               ([\w]+) (?{ $key = $^N; }) \s* = \s* \"
               ([\w\-]+) (?{ $attrs{$key} = $^N; }) \"
@@ -327,7 +327,7 @@ sub evalJobs {
     my ($inputInfo, $exprType, $nixExprInputName, $nixExprPath) = @_;
 
     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"
         if scalar @{$inputInfo->{$nixExprInputName}} != 1;
     my $nixExprFullPath = $nixExprInput->{storePath} . "/" . $nixExprPath;