From 3383eefc8244c14db921ed13cccd9bacdd615033 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 21 Apr 2016 18:36:48 +0200 Subject: [PATCH] Drop checks for old ostree versions --- app/xdg-app-builtins-add-remote.c | 5 ----- configure.ac | 1 - 2 files changed, 6 deletions(-) diff --git a/app/xdg-app-builtins-add-remote.c b/app/xdg-app-builtins-add-remote.c index 2b53c0dbc..dc39dfd5a 100644 --- a/app/xdg-app-builtins-add-remote.c +++ b/app/xdg-app-builtins-add-remote.c @@ -129,14 +129,9 @@ import_keys (XdgAppDir *dir, if (!open_source_stream (&input_stream, cancellable, error)) return FALSE; -#ifdef HAVE_OSTREE_REPO_REMOTE_GPG_IMPORT if (!ostree_repo_remote_gpg_import (xdg_app_dir_get_repo (dir), remote_name, input_stream, NULL, &imported, cancellable, error)) return FALSE; -#else - if (FALSE) - return xdg_app_fail (error, "gpg key import not supported by libostree, use --no-gpg-verify"); -#endif /* XXX If we ever add internationalization, use ngettext() here. */ g_print ("Imported %u GPG key%s to remote \"%s\"\n", diff --git a/configure.ac b/configure.ac index a384aece1..e9b06ce16 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,6 @@ AC_SUBST(OSTREE_CFLAGS) AC_SUBST(OSTREE_LIBS) save_LIBS=$LIBS LIBS=$OSTREE_LIBS -AC_CHECK_FUNCS(ostree_repo_remote_gpg_import) LIBS=$save_LIBS PKG_CHECK_MODULES(FUSE, [fuse])