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

fu-keyring-utils: Don't fail missing PKI directory when compiled with GPG/PKCS7

Browse Source 
This directory won't be installed when compiled without those.
This commit is contained in:
Mario Limonciello 2019-01-30 15:01:52 -06:00 committed by Mario Limonciello
parent 769f990cf6
commit 19968a756d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fu-keyring-utils.c
View File

@ -135,6 +135,7 @@ fu_keyring_get_release_trust_flags (XbNode *release,
/* check we were installed correctly */ /* check we were installed correctly */
sysconfdir = fu_common_get_path (FU_PATH_KIND_SYSCONFDIR); sysconfdir = fu_common_get_path (FU_PATH_KIND_SYSCONFDIR);
pki_dir = g_build_filename (sysconfdir, "pki", PACKAGE_NAME, NULL); pki_dir = g_build_filename (sysconfdir, "pki", PACKAGE_NAME, NULL);
#if defined(ENABLE_PKCS7) || defined(ENABLE_PKCS7)
if (!g_file_test (pki_dir, G_FILE_TEST_EXISTS)) { if (!g_file_test (pki_dir, G_FILE_TEST_EXISTS)) {
g_set_error (error, g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,
@ -142,6 +143,7 @@ fu_keyring_get_release_trust_flags (XbNode *release,
"PKI directory %s not found", pki_dir); "PKI directory %s not found", pki_dir);
return FALSE; return FALSE;
} }
#endif
/* verify against the system trusted keys */ /* verify against the system trusted keys */
kr = fu_keyring_create_for_kind (keyring_kind, error); kr = fu_keyring_create_for_kind (keyring_kind, error);