diff options
author | Kalev Lember <klember@redhat.com> | 2019-01-04 12:54:38 +0100 |
---|---|---|
committer | Kalev Lember <klember@redhat.com> | 2019-01-04 12:57:19 +0100 |
commit | 425d551d2f357335aaa5adcee311579a2aec6acb (patch) | |
tree | 6e4da1fad7c200aad3626981c41b204f50f77c6a /libappstream-glib | |
parent | 83915db0b30f7093ee8250110bd3a4ff6a96d7f0 (diff) | |
download | appstream-glib-425d551d2f357335aaa5adcee311579a2aec6acb.tar.gz |
Use as_utils_vercmp_full internally
This fixes, among other things, appdata validation when the version goes
from 9.5 to 10, or 0.9 to 1.
This partially fixes https://github.com/hughsie/appstream-glib/issues/270
We're still failing to correctly compare "Build 9.5" to "Build 10".
Diffstat (limited to 'libappstream-glib')
-rw-r--r-- | libappstream-glib/as-app-validate.c | 2 | ||||
-rw-r--r-- | libappstream-glib/as-release.c | 2 | ||||
-rw-r--r-- | libappstream-glib/as-require.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c index 628a527..a9ad2ca 100644 --- a/libappstream-glib/as-app-validate.c +++ b/libappstream-glib/as-app-validate.c @@ -944,7 +944,7 @@ as_app_validate_releases (AsApp *app, AsAppValidateHelper *helper, GError **erro const gchar *version_old = as_release_get_version (release_old); if (version == NULL || version_old == NULL) continue; - if (as_utils_vercmp (version, version_old) > 0) { + if (as_utils_vercmp_full (version, version_old, AS_VERSION_COMPARE_FLAG_NONE) > 0) { ai_app_validate_add (helper, AS_PROBLEM_KIND_TAG_INVALID, "<release> versions are not in order " diff --git a/libappstream-glib/as-release.c b/libappstream-glib/as-release.c index 9c6ec59..e4d58c6 100644 --- a/libappstream-glib/as-release.c +++ b/libappstream-glib/as-release.c @@ -249,7 +249,7 @@ as_release_vercmp (AsRelease *rel1, AsRelease *rel2) return 1; /* fall back to the version strings */ - val = as_utils_vercmp (priv2->version, priv1->version); + val = as_utils_vercmp_full (priv2->version, priv1->version, AS_VERSION_COMPARE_FLAG_NONE); if (val != G_MAXINT) return val; diff --git a/libappstream-glib/as-require.c b/libappstream-glib/as-require.c index 4604e79..11a1dc3 100644 --- a/libappstream-glib/as-require.c +++ b/libappstream-glib/as-require.c @@ -369,27 +369,27 @@ as_require_version_compare (AsRequire *require, switch (priv->compare) { case AS_REQUIRE_COMPARE_EQ: - rc = as_utils_vercmp (version, priv->version); + rc = as_utils_vercmp_full (version, priv->version, AS_VERSION_COMPARE_FLAG_NONE); ret = rc == 0; break; case AS_REQUIRE_COMPARE_NE: - rc = as_utils_vercmp (version, priv->version); + rc = as_utils_vercmp_full (version, priv->version, AS_VERSION_COMPARE_FLAG_NONE); ret = rc != 0; break; case AS_REQUIRE_COMPARE_LT: - rc = as_utils_vercmp (version, priv->version); + rc = as_utils_vercmp_full (version, priv->version, AS_VERSION_COMPARE_FLAG_NONE); ret = rc < 0; break; case AS_REQUIRE_COMPARE_GT: - rc = as_utils_vercmp (version, priv->version); + rc = as_utils_vercmp_full (version, priv->version, AS_VERSION_COMPARE_FLAG_NONE); ret = rc > 0; break; case AS_REQUIRE_COMPARE_LE: - rc = as_utils_vercmp (version, priv->version); + rc = as_utils_vercmp_full (version, priv->version, AS_VERSION_COMPARE_FLAG_NONE); ret = rc <= 0; break; case AS_REQUIRE_COMPARE_GE: - rc = as_utils_vercmp (version, priv->version); + rc = as_utils_vercmp_full (version, priv->version, AS_VERSION_COMPARE_FLAG_NONE); ret = rc >= 0; break; case AS_REQUIRE_COMPARE_GLOB: |