From fd5e642513ea08cc9ba3b4197bcbf0b8d37ae966 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Wed, 19 Oct 2022 01:04:49 -0400 Subject: import/utils: spdx-string->license: Support '+' operator. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, '+' was supported only via special cases for deprecated GNU identifiers like 'GPL-N+'. This commit adds support for other uses of '+', such as 'AFL-2.0+' and 'LPPL-1.0+'. Strictly speaking, '+' is an operator, not part of the SPDX license identifier, but it is useful to handle it here. * guix/import/utils.scm (spdx-string->license): Support '+' operator. * tests/import-utils.scm ("spdx-string->license"): Test it. Signed-off-by: Ludovic Courtès --- tests/import-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/import-utils.scm b/tests/import-utils.scm index ee5b16adb8..f50f730873 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -236,8 +236,8 @@ Differences are hard to spot, e.g. in CLOS vs. GOOPS.")) (hidden-package? pkg)))) (test-equal "spdx-string->license" - '(license:gpl3+ license:agpl3) + '(license:gpl3+ license:agpl3 license:gpl2+) (map spdx-string->license - '("GPL-3.0-oR-LaTeR" "AGPL-3.0"))) + '("GPL-3.0-oR-LaTeR" "AGPL-3.0" "GPL-2.0+"))) (test-end "import-utils") -- cgit 1.4.1