summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalev Lember <klember@redhat.com>2016-12-29 17:00:32 +0100
committerKalev Lember <klember@redhat.com>2016-12-29 17:00:32 +0100
commit20f5268e8c9c156ecbb8ac6d3f1bf73dc1fec8d6 (patch)
treee8cd02e8f6e401d577672627fa7d22ca7a454ff8
parent54e0c38af7a03406df04ccf90633d84806b82c84 (diff)
downloadappstream-glib-20f5268e8c9c156ecbb8ac6d3f1bf73dc1fec8d6.tar.gz
Revert "Remove invalid SPDX licenses from content license lookup table"
Oops. These all turned out to be valid licenses, formed with the new "+" operator from the License Expression Syntax introduced in SPDX v2.0. This reverts commit 54e0c38af7a03406df04ccf90633d84806b82c84.
-rw-r--r--libappstream-glib/as-app-validate.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c
index 2b38cd7..7833722 100644
--- a/libappstream-glib/as-app-validate.c
+++ b/libappstream-glib/as-app-validate.c
@@ -951,12 +951,20 @@ as_app_validate_is_content_license_id (const gchar *license_id)
return TRUE;
if (g_strcmp0 (license_id, "@CC-BY-3.0") == 0)
return TRUE;
+ if (g_strcmp0 (license_id, "@CC-BY-3.0+") == 0)
+ return TRUE;
if (g_strcmp0 (license_id, "@CC-BY-4.0") == 0)
return TRUE;
+ if (g_strcmp0 (license_id, "@CC-BY-4.0+") == 0)
+ return TRUE;
if (g_strcmp0 (license_id, "@CC-BY-SA-3.0") == 0)
return TRUE;
+ if (g_strcmp0 (license_id, "@CC-BY-SA-3.0+") == 0)
+ return TRUE;
if (g_strcmp0 (license_id, "@CC-BY-SA-4.0") == 0)
return TRUE;
+ if (g_strcmp0 (license_id, "@CC-BY-SA-4.0+") == 0)
+ return TRUE;
if (g_strcmp0 (license_id, "@GFDL-1.1") == 0)
return TRUE;
if (g_strcmp0 (license_id, "@GFDL-1.2") == 0)