From 19968a756d23218d1cb9f77a63eab7268488371d Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Wed, 30 Jan 2019 15:01:52 -0600 Subject: [PATCH] fu-keyring-utils: Don't fail missing PKI directory when compiled with GPG/PKCS7 This directory won't be installed when compiled without those. --- src/fu-keyring-utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/fu-keyring-utils.c b/src/fu-keyring-utils.c index a3f1936a7..12c8d0bd4 100644 --- a/src/fu-keyring-utils.c +++ b/src/fu-keyring-utils.c @@ -135,6 +135,7 @@ fu_keyring_get_release_trust_flags (XbNode *release, /* check we were installed correctly */ sysconfdir = fu_common_get_path (FU_PATH_KIND_SYSCONFDIR); 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)) { g_set_error (error, FWUPD_ERROR, @@ -142,6 +143,7 @@ fu_keyring_get_release_trust_flags (XbNode *release, "PKI directory %s not found", pki_dir); return FALSE; } +#endif /* verify against the system trusted keys */ kr = fu_keyring_create_for_kind (keyring_kind, error);