summary refs log tree commit diff
path: root/tests/import-utils.scm
diff options
context:
space:
mode:
authorPhilip McGrath <philip@philipmcgrath.com>2022-10-19 01:04:49 -0400
committerLudovic Courtès <ludo@gnu.org>2022-11-18 15:44:38 +0100
commitfd5e642513ea08cc9ba3b4197bcbf0b8d37ae966 (patch)
tree454070472bc81b6a822fa8e93a481d9cfa32fd54 /tests/import-utils.scm
parent07482dc0511350d596fdd25f7645dd6f4f91313b (diff)
downloadguix-fd5e642513ea08cc9ba3b4197bcbf0b8d37ae966.tar.gz
import/utils: spdx-string->license: Support '+' operator.
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 <ludo@gnu.org>
Diffstat (limited to 'tests/import-utils.scm')
-rw-r--r--tests/import-utils.scm4
1 files changed, 2 insertions, 2 deletions
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")