From b1a7a5723b6a817e9d30ea19154ebc8f12d9f5de Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 9 Sep 2022 17:27:23 +0200 Subject: etc: teams: Add regular expression support to scopes. * etc/teams.scm (find-teams-by-scope): Differentiate between raw strings and regexps. Make raw string matches strict. Signed-off-by: Mathieu Othacehe --- etc/teams.scm.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'etc/teams.scm.in') diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 549e31d9f0..a2b22cb165 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -32,6 +32,7 @@ (srfi srfi-9) (srfi srfi-26) (ice-9 format) + (ice-9 regex) (ice-9 match) (guix ui) (git)) @@ -289,9 +290,11 @@ (define (find-team-by-scope files) (hash-fold (lambda (key team acc) (if (any (lambda (file) - (any (lambda (scope) - ;; XXX: Add regex support? - (string-prefix? scope file)) + (any (match-lambda + ((? string? scope) + (string=? scope file)) + ((? regexp? scope) + (regexp-exec scope file))) (team-scope team))) files) (cons team acc) -- cgit v1.2.3