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

gpg: Fix _ostree_gpg_verifier_add_keyring() 

The function never fails, but its API makes it look like it can.

Fortunately it's private, so just fix it.
This commit is contained in:
Matthew Barnes 2015-05-01 15:19:20 -04:00
parent e7246e6d64
commit f162c0b6d6
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,16 +259,13 @@ out:
return result; return result;
} }
gboolean void
_ostree_gpg_verifier_add_keyring (OstreeGpgVerifier *self, _ostree_gpg_verifier_add_keyring (OstreeGpgVerifier *self,
GFile *path, GFile *path)
GCancellable *cancellable,
GError **error)
{ {
g_return_val_if_fail (path != NULL, FALSE); g_return_if_fail (G_IS_FILE (path));
self->keyrings = g_list_append (self->keyrings, g_object_ref (path)); self->keyrings = g_list_append (self->keyrings, g_object_ref (path));
return TRUE;
} }
gboolean gboolean

7
src/libostree/ostree-gpg-verifier.h
View File

@ -51,8 +51,7 @@ gboolean _ostree_gpg_verifier_add_keyring_dir (OstreeGpgVerifier *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
gboolean _ostree_gpg_verifier_add_keyring (OstreeGpgVerifier *self, void _ostree_gpg_verifier_add_keyring (OstreeGpgVerifier *self,
GFile *path, GFile *path);
GCancellable *cancellable,
GError **error);
G_END_DECLS G_END_DECLS

4
src/libostree/ostree-repo.c
View File

@ -3376,9 +3376,7 @@ _ostree_repo_gpg_verify_with_metadata (OstreeRepo *self,
} }
if (extra_keyring != NULL) if (extra_keyring != NULL)
{ {
if (!_ostree_gpg_verifier_add_keyring (verifier, extra_keyring, _ostree_gpg_verifier_add_keyring (verifier, extra_keyring);
cancellable, error))
goto out;
} }
if (metadata) if (metadata)