proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-21 21:47:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-introduce GUID support to fwupdmgr and fwupdtool

Browse Source 
This reverts commit dca4d6a5d6.

I've had two vendors ask me why the GUIDs have disappeared from the device.
This commit is contained in:
Richard Hughes 2019-09-11 10:25:47 +01:00
parent 04cb360847
commit 71db86f466
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/fu-util-common.c
View File

@ -880,10 +880,13 @@ gchar *
fu_util_device_to_string (FwupdDevice *dev, guint idt) fu_util_device_to_string (FwupdDevice *dev, guint idt)
{ {
FwupdUpdateState state; FwupdUpdateState state;
GPtrArray *guids = fwupd_device_get_guids (dev);
GPtrArray *instance_ids = fwupd_device_get_instance_ids (dev);
GString *str = g_string_new (NULL); GString *str = g_string_new (NULL);
const gchar *tmp; const gchar *tmp;
const gchar *tmp2; const gchar *tmp2;
guint64 flags = fwupd_device_get_flags (dev); guint64 flags = fwupd_device_get_flags (dev);
g_autoptr(GHashTable) ids = NULL;
g_autoptr(GString) flags_str = g_string_new (NULL); g_autoptr(GString) flags_str = g_string_new (NULL);
/* some fields are intentionally not included and are only shown in --verbose */ /* some fields are intentionally not included and are only shown in --verbose */
@ -999,6 +1002,32 @@ fu_util_device_to_string (FwupdDevice *dev, guint idt)
fu_common_string_append_kv (str, idt + 1, _("Flags"), flags_str->str); fu_common_string_append_kv (str, idt + 1, _("Flags"), flags_str->str);
} }
/* all GUIDs for this hardware, with IDs if available */
ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
for (guint i = 0; i < instance_ids->len; i++) {
const gchar *instance_id = g_ptr_array_index (instance_ids, i);
g_hash_table_insert (ids,
fwupd_guid_hash_string (instance_id),
g_strdup (instance_id));
}
for (guint i = 0; i < guids->len; i++) {
const gchar *guid = g_ptr_array_index (guids, i);
const gchar *instance_id = g_hash_table_lookup (ids, guid);
g_autofree gchar *guid_src = NULL;
/* instance IDs are only available as root */
if (instance_id == NULL) {
guid_src = g_strdup (guid);
} else {
guid_src = g_strdup_printf ("%s ← %s", guid, instance_id);
}
if (i == 0) {
/* TRANSLATORS: global ID common to all similar hardware */
fu_common_string_append_kv (str, idt + 1, ngettext ("GUID", "GUIDs", guids->len), guid_src);
} else {
fu_common_string_append_kv (str, idt + 1, "", guid_src);
}
}
return g_string_free (str, FALSE); return g_string_free (str, FALSE);
} }