diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2015-05-01 15:19:20 -0400 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2015-05-01 15:24:11 -0400 |
| commit | f162c0b6d6c6d993bd6d2e3a038c836a6244414b (patch) | |
| tree | 4766047dfa1dba3bc3bed7250381421b12b4e299 /src | |
| parent | e7246e6d6406da86498480b73363a1bfdcd9f8af (diff) | |
| download | ostree-f162c0b6d6c6d993bd6d2e3a038c836a6244414b.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libostree/ostree-gpg-verifier.c | 9 | ||||
| -rw-r--r-- | src/libostree/ostree-gpg-verifier.h | 7 | ||||
| -rw-r--r-- | src/libostree/ostree-repo.c | 4 |
3 files changed, 7 insertions, 13 deletions
diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c index 96ca7c65..42581b3f 100644 --- a/src/libostree/ostree-gpg-verifier.c +++ b/src/libostree/ostree-gpg-verifier.c @@ -259,16 +259,13 @@ out: return result; } -gboolean +void _ostree_gpg_verifier_add_keyring (OstreeGpgVerifier *self, - GFile *path, - GCancellable *cancellable, - GError **error) + GFile *path) { - 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)); - return TRUE; } gboolean diff --git a/src/libostree/ostree-gpg-verifier.h b/src/libostree/ostree-gpg-verifier.h index b505d85a..54be424f 100644 --- a/src/libostree/ostree-gpg-verifier.h +++ b/src/libostree/ostree-gpg-verifier.h @@ -51,8 +51,7 @@ gboolean _ostree_gpg_verifier_add_keyring_dir (OstreeGpgVerifier *self, GCancellable *cancellable, GError **error); -gboolean _ostree_gpg_verifier_add_keyring (OstreeGpgVerifier *self, - GFile *path, - GCancellable *cancellable, - GError **error); +void _ostree_gpg_verifier_add_keyring (OstreeGpgVerifier *self, + GFile *path); + G_END_DECLS diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 5bdba3c6..1ec18af4 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -3376,9 +3376,7 @@ _ostree_repo_gpg_verify_with_metadata (OstreeRepo *self, } if (extra_keyring != NULL) { - if (!_ostree_gpg_verifier_add_keyring (verifier, extra_keyring, - cancellable, error)) - goto out; + _ostree_gpg_verifier_add_keyring (verifier, extra_keyring); } if (metadata) |