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

fu-engine: Don't fail get-details if compiled without GPG/PKCS7

Browse Source 
Similar to commit 7d35278 regarding the install option with a daemon compiled without
GPG, but now, if you also have a daemon compiled without GPG, and if you have downloaded a
CAB file from LVFS and ran get-details, it would fail to display the contents
of the associated CAB file.

This allows it to still display the contents of the CAB file, and
a warning will be displayed in the logs.
This commit is contained in:
Salud Lemus 2018-08-28 09:25:40 -07:00 committed by Richard Hughes
parent 812ac02bac
commit 980f2d9551
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fu-engine.c
View File

@ -2014,6 +2014,7 @@ fu_engine_get_result_from_app (FuEngine *self, AsApp *app, GError **error)
g_autoptr(FuInstallTask) task = NULL; g_autoptr(FuInstallTask) task = NULL;
g_autoptr(FwupdDevice) dev = NULL; g_autoptr(FwupdDevice) dev = NULL;
g_autoptr(FwupdRelease) rel = NULL; g_autoptr(FwupdRelease) rel = NULL;
g_autoptr(GError) error_local = NULL;
dev = fwupd_device_new (); dev = fwupd_device_new ();
provides = as_app_get_provides (app); provides = as_app_get_provides (app);
@ -2057,8 +2058,19 @@ fu_engine_get_result_from_app (FuEngine *self, AsApp *app, GError **error)
/* verify trust */ /* verify trust */
release = as_app_get_release_default (app); release = as_app_get_release_default (app);
if (!fu_keyring_get_release_trust_flags (release, &trust_flags, error)) if (!fu_keyring_get_release_trust_flags (release,
return NULL; &trust_flags,
&error_local)) {
if (g_error_matches (error_local,
FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED)) {
g_warning ("Ignoring verification: %s",
error_local->message);
} else {
g_propagate_error (error, g_steal_pointer (&error_local));
return NULL;
}
}
/* create a result with all the metadata in */ /* create a result with all the metadata in */
fwupd_device_set_description (dev, as_app_get_description (app, NULL)); fwupd_device_set_description (dev, as_app_get_description (app, NULL));