keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Use new OSTree API to verify commits by remotes

Browse Source 
Otherwise, we would show remotes using the new `gpgkeypath`
as unknown.

See: https://github.com/ostreedev/ostree/pull/575
See: https://github.com/ostreedev/ostree/issues/573
See: https://bugzilla.redhat.com/show_bug.cgi?id=1393545

Closes: #521
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-11-16 16:32:51 -05:00 committed by Atomic Bot
parent 2f9d586bdc
commit 6074a6d728
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -74,6 +74,11 @@ dnl bundled libdnf
PKGDEP_RPMOSTREE_CFLAGS="-I $(pwd)/libdnf -I $(pwd)/libdnf-build $PKGDEP_RPMOSTREE_CFLAGS" PKGDEP_RPMOSTREE_CFLAGS="-I $(pwd)/libdnf -I $(pwd)/libdnf-build $PKGDEP_RPMOSTREE_CFLAGS"
PKGDEP_RPMOSTREE_LIBS="-L$(pwd)/libdnf-build/libdnf -ldnf $PKGDEP_RPMOSTREE_LIBS" PKGDEP_RPMOSTREE_LIBS="-L$(pwd)/libdnf-build/libdnf -ldnf $PKGDEP_RPMOSTREE_LIBS"
save_LIBS=$LIBS
LIBS=$PKGDEP_RPMOSTREE_LIBS
AC_CHECK_FUNCS(ostree_repo_verify_commit_for_remote)
LIBS=$save_LIBS
AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_PATH_PROG([XSLTPROC], [xsltproc])
GLIB_TESTS GLIB_TESTS

8
src/daemon/rpmostreed-deployment-utils.c
View File

@ -96,9 +96,11 @@ rpmostreed_deployment_gpg_results (OstreeRepo *repo,
if (!gpg_verify) if (!gpg_verify)
goto out; goto out;
#ifdef HAVE_OSTREE_REPO_VERIFY_COMMIT_FOR_REMOTE
result = ostree_repo_verify_commit_ext (repo, csum, NULL, NULL, result = ostree_repo_verify_commit_for_remote (repo, csum, remote, NULL, &error);
NULL, &error); #else
result = ostree_repo_verify_commit_ext (repo, csum, NULL, NULL, NULL, &error);
#endif
if (!result) if (!result)
goto out; goto out;