taler-deployment

commit d7009b3fec6718e03c4bc88c0202859d3722e883
parent c42dbea3cda4a2ab2ce9ad46255a004c25dc078c
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Mon, 22 Apr 2019 16:45:20 +0200

No regex match against paths.

Diffstat:
M
buildbot/master.cfg
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -1,4 +1,5 @@
 import re
+from getpass import getuser
 from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.plugins import (reporters,
@@ -495,8 +496,7 @@ def pick_active_color(builder, workers_list, build_request):
     print("Found active color: %s" % str(active))
 
     for worker in workers_list:
-        if re.search("^/home/%s" % active,
-                     worker.worker.worker_basedir):
+        if active == getuser():
             f.close()
             print("Scheduling worker: %s" % str(worker))
             return worker
@@ -540,8 +540,7 @@ def pick_inactive_color(builder, workers_list, build_request):
     print("Found nonactive color: %s" % str(nonactive))
 
     for worker in workers_list:
-        if re.search("^/home/%s" % nonactive,
-                     worker.worker.worker_basedir):
+        if nonactive == getuser():
             f.close()
             print("Scheduling worker: %s" % str(worker))
             return worker