Require ostree 2017.10

This includes a change in how ostree reports missing gpg signatures
which makes the test-suite pass. Additionally that change requires
us to change how we detect such missing gpg signatures in one place.

We could try to support both versions, but the easiest fix is to just
require the latest ostree.
tingping/wmclass
Alexander Larsson 2017-08-15 18:26:04 +02:00
parent a2267359ed
commit 85ba1f75eb
2 changed files with 4 additions and 4 deletions

View File

@ -4491,9 +4491,9 @@ flatpak_pull_from_bundle (OstreeRepo *repo,
NULL, NULL, cancellable, &my_error);
if (gpg_result == NULL)
{
/* NOT_FOUND means no gpg signature, we ignore this *if* there
* is no gpg key specified in the bundle or by the user */
if (g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) &&
/* no gpg signature, we ignore this *if* there is no gpg key
* specified in the bundle or by the user */
if (g_error_matches (my_error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_NO_SIGNATURE) &&
!require_gpg_signature)
{
g_clear_error (&my_error);

View File

@ -30,7 +30,7 @@ AC_INIT([Flatpak],
GLIB_REQS=2.44
SYSTEM_BWRAP_REQS=0.1.8
OSTREE_REQS=2017.7
OSTREE_REQS=2017.10
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE