From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id XZA7O10GemOi6AAAbAwnHQ (envelope-from ) for ; Sun, 20 Nov 2022 11:50:06 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OPAvOV0GemNQDQAAG6o9tA (envelope-from ) for ; Sun, 20 Nov 2022 11:50:05 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 916E739907 for ; Sun, 20 Nov 2022 11:50:05 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owhtj-0003CJ-Ib; Sun, 20 Nov 2022 05:50:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owhti-0003BJ-PK for guix-patches@gnu.org; Sun, 20 Nov 2022 05:50:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owhti-0003Pb-Ej for guix-patches@gnu.org; Sun, 20 Nov 2022 05:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owhti-0006Tk-A6 for guix-patches@gnu.org; Sun, 20 Nov 2022 05:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#58621] [PATCH 0/3] import/utils: spdx-string->license: Match case-insensitively and support '+' operator. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Nov 2022 10:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58621 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Philip McGrath Cc: 58621-done@debbugs.gnu.org Received: via spool by 58621-done@debbugs.gnu.org id=D58621.166894136224850 (code D ref 58621); Sun, 20 Nov 2022 10:50:02 +0000 Received: (at 58621-done) by debbugs.gnu.org; 20 Nov 2022 10:49:22 +0000 Received: from localhost ([127.0.0.1]:42462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owht3-0006Sj-Nu for submit@debbugs.gnu.org; Sun, 20 Nov 2022 05:49:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owht2-0006SY-9K for 58621-done@debbugs.gnu.org; Sun, 20 Nov 2022 05:49:20 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owhsx-0003MC-0T; Sun, 20 Nov 2022 05:49:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=X2BhobfMFXpv5F6pSaKYEP8TCwcA1+k25RuYnMBpQA0=; b=GfmmskwDm4e3hPXuvHSP Z0FAai1+bTOJQvt2haOk4izRF8pB0jjgG0IDIUePnIC90dCrjk2o/3FYcIprc7OPoT+SSm4OTA8sq fuQwsgwcksk2rC9WCto4Ad4oNINIZoQGlJLv3VhVDAEI9U8t47wn5Ga0RpEkofVhrz9p3OGdwl9Sq RCAcobgU7pH3s1HNfmFaXb05KQVK3Fpwwnwk8pWv5gQKUTwxaqjkrOuu2fVhuds+mIroLkzUMrfZ3 6NztMZsZDrkCAFB7QNh1dhGMmy17yfN6QoKWB5stUh/DKAJJgpn18yR+khhfH+xI33vK3t7vwOaLk YSwTdYbE0RQeIw==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owhsw-0004qF-Jx; Sun, 20 Nov 2022 05:49:14 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <13f3bbfbd88f0e9c984fd61a5c936de08d814ce0.1666146461.git.philip@philipmcgrath.com> <877czscr61.fsf_-_@gnu.org> <7474321.EvYhyI6sBW@bastet> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: =?UTF-8?Q?D=C3=A9cadi?= 30 Brumaire an 231 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Rouleau X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 20 Nov 2022 11:49:12 +0100 In-Reply-To: <7474321.EvYhyI6sBW@bastet> (Philip McGrath's message of "Fri, 18 Nov 2022 15:21:52 -0500") Message-ID: <87leo57vfb.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668941405; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=X2BhobfMFXpv5F6pSaKYEP8TCwcA1+k25RuYnMBpQA0=; b=MM3mtPX96dWZQmpvpvrMdszEU9pReDROYfy1LNV+vM3eMr2UCjShE6+dfaUZzWipV+NMx7 hU6CI0lZx319vkwc816Pq2KVR3d/koAOQTyIucRxoM+C1jp0XaA5awKYpNqwGwC0dIxfI8 xIfB+FQuhi8BMeBtHeY8nwB6aRkqj3KAIaqDp6KItJMIbV2aKwfLwlhwsostZ14g6g3bBw RmWiPIVJpFm0cdNEJyHxLQ9mE2OXyryWteixVrwZEPvpbHUix0EyAxSDJ+fJTU9qfIHUgj g/7Ur/JHV1A1go7fcKJwPSVc2z3prnMAzUyjVyYW/LjYCsfFteBzqVshhGjPZA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668941405; a=rsa-sha256; cv=none; b=k9M4zyh+H/rAflBu/K9XzCuUDpDFgPhvp2k1Fagem7H7mJBCrTNE+ZvpUVse2VFAQ2FODt Hkt2sEOpA16zGb+Twtf2piEqpj+MPXiSX5HbIM5/LfMSbyBhDBl5QZyaWwAsajJy7mwYnO AcBfnAA/J9wjJR/MPU+epKgna4c6h/mL+3x16Ed/ec/mGqo9MICBe17RHQqnzFPbA4W+pR cQqhEvn6sAUi2CwiIY7NhwzMa7luZhdhLct/ef0D2EcE/j1pgFi/V333sJ9ciwPhcP6JEJ kwP1KrGP909RhkjVdAqXgE9sIo/hOoJB25jChSK6OnZpdUctFGeHJC7Tn3/aIg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=GfmmskwD; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=GfmmskwD; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 916E739907 X-Spam-Score: -3.91 X-Migadu-Scanner: scn1.migadu.com X-TUID: NEaCo0pOBYXR Hi, Philip McGrath skribis: > On Friday, November 18, 2022 8:45:26 AM EST Ludovic Court=C3=A8s wrote: [...] >> Philip McGrath skribis: >> > + (and (string-suffix? "+" str) >> > + ;; We try the form with the + to support deprecated identif= iers >> > for + ;; GNU licenses (see above). Here, we handle other uses >> > of +. + (spdx-string->license >> > + (substring str 0 (- (string-length str) 1))))))) >>=20 >> I guess we can remove the =E2=80=9C+=E2=80=9D forms from the alist now? >>=20 > > I think we still want the "+" forms in the alist so that we continue conv= ert=20 > "GPL-2.0+" as though it were "GPL-2.0-or-later", not "GPL-2.0-only". Oh right. Then I wonder why the code above (with =E2=80=98substring=E2=80= =99) doesn=E2=80=99t replace =E2=80=9C+=E2=80=9D with =E2=80=9C-or-later=E2=80=9D? Ludo=E2=80=99.