proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-06-28 14:19:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fu-engine: Copy the VersionFormat from the CAB if specified in get-details

Browse Source
This commit is contained in:
Mario Limonciello 2020-03-09 14:03:03 -05:00 committed by Mario Limonciello
parent 4779237412
commit f430da01e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fu-engine.c
View File

@ -2812,10 +2812,8 @@ fu_engine_md_refresh_device_verfmt (FuEngine *self, FuDevice *device, XbNode *co
} }
static void static void
fu_engine_md_refresh_device (FuEngine *self, FuDevice *device) fu_engine_md_refresh_device_from_component (FuEngine *self, FuDevice *device, XbNode *component)
{ {
g_autoptr(XbNode) component = fu_engine_get_component_by_guids (self, device);
/* set or clear the SUPPORTED flag */ /* set or clear the SUPPORTED flag */
fu_engine_md_refresh_device_supported (self, device, component); fu_engine_md_refresh_device_supported (self, device, component);
@ -2836,7 +2834,8 @@ fu_engine_md_refresh_devices (FuEngine *self)
g_autoptr(GPtrArray) devices = fu_device_list_get_all (self->device_list); g_autoptr(GPtrArray) devices = fu_device_list_get_all (self->device_list);
for (guint i = 0; i < devices->len; i++) { for (guint i = 0; i < devices->len; i++) {
FuDevice *device = g_ptr_array_index (devices, i); FuDevice *device = g_ptr_array_index (devices, i);
fu_engine_md_refresh_device (self, device); g_autoptr(XbNode) component = fu_engine_get_component_by_guids (self, device);
fu_engine_md_refresh_device_from_component (self, device, component);
} }
} }
@ -3243,6 +3242,7 @@ fu_engine_get_result_from_component (FuEngine *self, XbNode *component, GError *
fu_device_set_name (dev, fu_device_get_name (device)); fu_device_set_name (dev, fu_device_get_name (device));
fu_device_set_flags (dev, fu_device_get_flags (device)); fu_device_set_flags (dev, fu_device_get_flags (device));
fu_device_set_id (dev, fu_device_get_id (device)); fu_device_set_id (dev, fu_device_get_id (device));
fu_device_set_version_raw (dev, fu_device_get_version_raw (device));
fu_device_set_version_format (dev, fu_device_get_version_format (device)); fu_device_set_version_format (dev, fu_device_get_version_format (device));
fu_device_set_version (dev, fu_device_get_version (device)); fu_device_set_version (dev, fu_device_get_version (device));
} }
@ -3380,6 +3380,7 @@ fu_engine_get_details (FuEngine *self, gint fd, GError **error)
fwupd_release_set_remote_id (rel, remote_id); fwupd_release_set_remote_id (rel, remote_id);
fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_SUPPORTED); fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_SUPPORTED);
} }
fu_engine_md_refresh_device_from_component (self, dev, component);
g_ptr_array_add (details, dev); g_ptr_array_add (details, dev);
} }
return g_steal_pointer (&details); return g_steal_pointer (&details);