packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpg: Gracefully handle no trusted.gpg.d directory 

This is a deprecated fallback method anyway.  We prefer
remote-specific keyrings now.

https://bugzilla.gnome.org/750049
This commit is contained in:
Matthew Barnes 2015-05-28 16:25:51 -04:00 committed by Colin Walters
parent 44e7e59d27
commit 94ef7669d7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libostree/ostree-gpg-verifier.c
View File

@ -84,6 +84,8 @@ ostree_gpg_verifier_initable_init (GInitable *initable,
if (!default_keyring_path) if (!default_keyring_path)
default_keyring_path = DATADIR "/ostree/trusted.gpg.d/"; default_keyring_path = DATADIR "/ostree/trusted.gpg.d/";
if (g_file_test (default_keyring_path, G_FILE_TEST_IS_DIR))
{
default_keyring_dir = g_file_new_for_path (default_keyring_path); default_keyring_dir = g_file_new_for_path (default_keyring_path);
if (!_ostree_gpg_verifier_add_keyring_dir (self, default_keyring_dir, if (!_ostree_gpg_verifier_add_keyring_dir (self, default_keyring_dir,
cancellable, error)) cancellable, error))
@ -92,6 +94,7 @@ ostree_gpg_verifier_initable_init (GInitable *initable,
gs_file_get_path_cached (default_keyring_dir)); gs_file_get_path_cached (default_keyring_dir));
goto out; goto out;
} }
}
ret = TRUE; ret = TRUE;
out: out: