proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-06 11:07:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check the device requirements when returning from GetDetails

Browse Source 
One vendor is shipping a cab archive with two metadata files, both referencing
the same GUID. The 'correct' metainfo description is selected using a GUID
'other device' requirement. This works fine when installing, but breaks when
double clicking on the .cab file as both components are valid, and thus get
returned.

In this case, return the component that matches the requirement 'first' so that
it gets chosen by gnome-software as the default.
This commit is contained in:
Richard Hughes 2020-05-21 21:14:49 +01:00
parent 4b16642dc5
commit b3d3f21a00
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/fu-engine.c
View File

@ -3502,6 +3502,20 @@ fu_engine_get_result_from_component (FuEngine *self, XbNode *component, GError *
return g_steal_pointer (&dev);
}
static gint
fu_engine_get_details_sort_cb (gconstpointer a, gconstpointer b)
{
FuDevice *device1 = *((FuDevice **) a);
FuDevice *device2 = *((FuDevice **) b);
if (!fu_device_has_flag (device1, FWUPD_DEVICE_FLAG_UPDATABLE) &&
fu_device_has_flag (device2, FWUPD_DEVICE_FLAG_UPDATABLE))
return 1;
if (fu_device_has_flag (device1, FWUPD_DEVICE_FLAG_UPDATABLE) &&
!fu_device_has_flag (device2, FWUPD_DEVICE_FLAG_UPDATABLE))
return -1;
return 0;
}
/**
* fu_engine_get_details:
* @self: A #FuEngine
@ -3574,8 +3588,34 @@ fu_engine_get_details (FuEngine *self, gint fd, GError **error)
fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_SUPPORTED);
}
fu_engine_md_refresh_device_from_component (self, dev, component);
/* if this matched a device on the system, ensure all the
* requirements passed before setting UPDATABLE */
if (fu_device_has_flag (dev, FWUPD_DEVICE_FLAG_UPDATABLE)) {
g_autoptr(FuInstallTask) task = fu_install_task_new (dev, component);
g_autoptr(GError) error_req = NULL;
if (!fu_engine_check_requirements (self, task,
FWUPD_INSTALL_FLAG_OFFLINE |
FWUPD_INSTALL_FLAG_ALLOW_REINSTALL |
FWUPD_INSTALL_FLAG_ALLOW_OLDER,
&error_req)) {
g_debug ("%s failed requirement checks: %s",
fu_device_get_id (dev),
error_req->message);
fu_device_remove_flag (dev, FWUPD_DEVICE_FLAG_UPDATABLE);
} else {
g_debug ("%s passed requirement checks",
fu_device_get_id (dev));
}
}
g_ptr_array_add (details, dev);
}
/* order multiple devices so that the one that passes the requirement
* is listed first */
g_ptr_array_sort (details, fu_engine_get_details_sort_cb);
return g_steal_pointer (&details);
}