Merge pull request #226 from jeremiah/patch-2

Clarify license problem descriptions in ambiguities.json

Unrelated build errors dealt with elsewhere.

Author: hesa

tests/shell/shell-test.sh

@@ -41,7 +41,7 @@ test_shell_silent()
 
 # test command: license
 test_shell_silent "license\nmit" "MIT"
-test_shell_silent "license\nmit and mit" "MIT AND MIT"
+test_shell_silent "license\nmit and mit" "MIT"
 
 # test command: simplify
 test_shell_silent "simplify\nmit and mit" "MIT"

tests/shell/test-issues.sh

@@ -35,4 +35,4 @@ echo "Testing issues"
 echo "=============="
 echo " https://github.com/hesa/foss-licenses/issues/214"
 echo "---------------------------------------------------"
-test_flame license "GPL" "GPL"
+test_flame license "GPL" "GPL-1.0-only OR GPL-2.0-only OR GPL-3.0-only"

var/ambiguities.json

@@ -12,14 +12,14 @@
               "License :: OSI Approved :: Academic Free License",
               "ACADEMIC FREE LICENSE _AFL_"
             ],
-            "problem": "This license has many different versions (1.1, 1.2, 2.0, 2.1 and 3.0). Without a version number it is not possible to determine which of the versions is meant."
+            "problem": "The Academic Free license has multiple versions: 1.1, 1.2, 2.0, 2.1 and 3.0. Without a version number it is impossible to determine the specific license being used."
         },
         "GNU Affero General Public License": {
             "aliases": [
               "AGPL",
               " Affero General Public License"
             ],
-            "problem": "This license has different versions (1.0, 2.0 and 3.0) and different names (version 1.0 does not have GNU in the name). Without a version number it is not possible to determine which of the versions is meant."
+            "problem": "This license has multiple versions (1.0, 2.0 and 3.0), and different names (version 1.0 does not have GNU in the name). Without a version number it is impossible to determine the specific license being used."
         },
         "Apache License": {
             "aliases": [