[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57646] [PATCH v2 2/4] etc: teams: Add regular expression support to
From: |
Mathieu Othacehe |
Subject: |
[bug#57646] [PATCH v2 2/4] etc: teams: Add regular expression support to scopes. |
Date: |
Mon, 12 Sep 2022 15:55:43 +0200 |
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
* etc/teams.scm (find-teams-by-scope): Differentiate between raw strings
and regexps. Make raw string matches strict.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
etc/teams.scm.in | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/etc/teams.scm.in b/etc/teams.scm.in
index 22177422c2..34cc547b26 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))
@@ -285,9 +286,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)
--
2.37.2