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

Set the verfmt of the returned device when the daemon device is unset

Browse Source 
This regressed in 1.5.5 when we migrated FWUPD_DEVICE_FLAG_MD_SET_VERFMT
into FU_DEVICE_INTERNAL_FLAG_MD_SET_VERFMT and forgot to copy the system
device internal flags.
This commit is contained in:
Richard Hughes 2021-10-17 15:32:31 +01:00
parent fcb5257e16
commit 15bf534e3f
4 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfwupdplugin/fu-device-private.h
View File

@ -52,3 +52,7 @@ void
fu_device_set_private_flags(FuDevice *self, guint64 flag);
void
fu_device_set_progress(FuDevice *self, FuProgress *progress);
FuDeviceInternalFlags
fu_device_get_internal_flags(FuDevice *self);
void
fu_device_set_internal_flags(FuDevice *self, FuDeviceInternalFlags flag);

34
libfwupdplugin/fu-device.c
View File

@ -336,6 +336,40 @@ fu_device_has_internal_flag(FuDevice *self, FuDeviceInternalFlags flag)
g_return_val_if_fail(FU_IS_DEVICE(self), FALSE);
return (priv->internal_flags & flag) > 0;
}
/**
* fu_device_get_internal_flags:
* @self: a #FuDevice
*
* Gets all the internal flags.
*
* Returns: flags, e.g. %FU_DEVICE_INTERNAL_FLAG_MD_SET_ICON
*
* Since: 1.7.1
**/
FuDeviceInternalFlags
fu_device_get_internal_flags(FuDevice *self)
{
FuDevicePrivate *priv = GET_PRIVATE(self);
g_return_val_if_fail(FU_IS_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_UNKNOWN);
return priv->internal_flags;
}
/**
* fu_device_set_internal_flags:
* @self: a #FuDevice
* @flags: internal device flags, e.g. %FU_DEVICE_INTERNAL_FLAG_MD_SET_ICON
*
* Sets the internal flags.
*
* Since: 1.7.1
**/
void
fu_device_set_internal_flags(FuDevice *self, FuDeviceInternalFlags flags)
{
FuDevicePrivate *priv = GET_PRIVATE(self);
g_return_if_fail(FU_IS_DEVICE(self));
priv->internal_flags = flags;
}
/**
* fu_device_add_private_flag:

2
libfwupdplugin/fwupdplugin.map
View File

@ -930,6 +930,8 @@ LIBFWUPDPLUGIN_1.7.1 {
fu_common_check_full_disk_encryption;
fu_common_mkdir;
fu_device_add_string;
fu_device_get_internal_flags;
fu_device_set_internal_flags;
fu_udev_device_new_with_context;
fu_usb_device_new_with_context;
local: *;

1
src/fu-engine.c
View File

@ -4243,6 +4243,7 @@ fu_engine_get_result_from_component(FuEngine *self,
if (device != NULL) {
fu_device_set_name(dev, fu_device_get_name(device));
fu_device_set_flags(dev, fu_device_get_flags(device));
fu_device_set_internal_flags(dev, fu_device_get_internal_flags(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));