proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-09 02:48:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fu-engine: Use unknown for version format by default on get-details

Browse Source
This commit is contained in:
Mario Limonciello 2020-02-25 11:12:35 -06:00 committed by Mario Limonciello
parent cfde249435
commit f675c21827
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fu-engine.c
View File

@ -322,7 +322,7 @@ fu_engine_set_device_version_format (FuEngine *self, FuDevice *device, XbNode *c
static gchar * static gchar *
fu_engine_get_release_version (FuEngine *self, FuDevice *dev, XbNode *rel, GError **error) fu_engine_get_release_version (FuEngine *self, FuDevice *dev, XbNode *rel, GError **error)
{ {
FwupdVersionFormat fmt = FWUPD_VERSION_FORMAT_TRIPLET; FwupdVersionFormat fmt = fu_device_get_version_format (dev);
const gchar *version; const gchar *version;
guint64 ver_uint32; guint64 ver_uint32;
@ -340,24 +340,14 @@ fu_engine_get_release_version (FuEngine *self, FuDevice *dev, XbNode *rel, GErro
if (g_strstr_len (version, -1, ".") != NULL) if (g_strstr_len (version, -1, ".") != NULL)
return g_strdup (version); return g_strdup (version);
/* specified in metadata or from a quirk */
fmt = fu_device_get_version_format (dev);
if (fmt == FWUPD_VERSION_FORMAT_UNKNOWN) {
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED,
"version format unset and version %s ambiguous",
version);
return NULL;
}
/* don't touch my version! */ /* don't touch my version! */
if (fmt == FWUPD_VERSION_FORMAT_PLAIN) if (fmt == FWUPD_VERSION_FORMAT_PLAIN)
return g_strdup (version); return g_strdup (version);
/* parse as integer */ /* parse as integer */
ver_uint32 = fu_common_strtoull (version); ver_uint32 = fu_common_strtoull (version);
if (ver_uint32 == 0 || ver_uint32 > G_MAXUINT32) if (fmt == FWUPD_VERSION_FORMAT_UNKNOWN ||
ver_uint32 == 0 || ver_uint32 > G_MAXUINT32)
return g_strdup (version); return g_strdup (version);
/* convert to dotted decimal */ /* convert to dotted decimal */