From patchwork Mon Sep 12 13:55:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 42522 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 57BB527BBEA; Mon, 12 Sep 2022 14:57:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 19A0927BBE9 for ; Mon, 12 Sep 2022 14:57:16 +0100 (BST) Received: from localhost ([::1]:53728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXjw3-0000oN-8x for patchwork@mira.cbaines.net; Mon, 12 Sep 2022 09:57:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXjvr-0000mI-65 for guix-patches@gnu.org; Mon, 12 Sep 2022 09:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXjvq-0004QH-Tg for guix-patches@gnu.org; Mon, 12 Sep 2022 09:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXjvq-0008Gk-Gh for guix-patches@gnu.org; Mon, 12 Sep 2022 09:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57646] [PATCH v2 2/4] etc: teams: Add regular expression support to scopes. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Sep 2022 13:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57646 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57646@debbugs.gnu.org Cc: Mathieu Othacehe , Liliana Marie Prikler Received: via spool by 57646-submit@debbugs.gnu.org id=B57646.166299096331731 (code B ref 57646); Mon, 12 Sep 2022 13:57:02 +0000 Received: (at 57646) by debbugs.gnu.org; 12 Sep 2022 13:56:03 +0000 Received: from localhost ([127.0.0.1]:47470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXjut-0008Fi-GA for submit@debbugs.gnu.org; Mon, 12 Sep 2022 09:56:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXjus-0008AK-4p for 57646@debbugs.gnu.org; Mon, 12 Sep 2022 09:56:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXjum-0004Lp-Re; Mon, 12 Sep 2022 09:55:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=W37E064o1Rxf0RVHvnPSmhaEIvbb8ihL3ynDXnneGlM=; b=Sdj2kmmjn239QEtGKSg/ GwaXrJ6T5wJ8z6ydISSBzVawQsu507Zt9WGb202/8ttxZhqPtGx0o6ca1LOC+55bsYxy5X97yJeYG bmk3dqe1YEBoACnB33MB+Sj+OT12FjkdV1OxXhdZSwbbSRD6iqyhbbGa0ZM2kFBQMhAwgjEzAleFv wvhucw3n26MBl7FPsS+Px8OQERdPmy6r0O4CkrrLtuzyteEvJMqeiYXeUI+4zVpjKcaS9U/HvjVZK bn5W2Ssxl+kmrYGrm9je/8FJKKg1A2xSdvi9LTADMrciVrmlnEFq1Eib1Wci3IOXqbB67QNg5DfCe F9LQzzU6vbLwLQ==; Received: from [2a02:587:1d33:7300:4fa4:945e:237e:7b1f] (port=42636 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXjum-0005y1-7i; Mon, 12 Sep 2022 09:55:56 -0400 From: Mathieu Othacehe Date: Mon, 12 Sep 2022 15:55:43 +0200 Message-Id: <20220912135545.24795-2-othacehe@gnu.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220912135545.24795-1-othacehe@gnu.org> References: <20220912135545.24795-1-othacehe@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Liliana Marie Prikler * 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(-) 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)