From c7776d0a6ff928cf830721659af56ebbc7844fc7 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 28 Nov 2016 12:25:59 +0100 Subject: [PATCH] Require new ostree and drop old workaroung OSTree 2016.4 fixes the scanning and purging issues that forced us to do a double-pull during sudir installs. --- common/flatpak-dir.c | 12 ------------ configure.ac | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 936856b2..c8fd2cc5 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -1325,18 +1325,6 @@ repo_pull_one_dir (OstreeRepo *self, options = g_variant_ref_sink (g_variant_builder_end (&builder)); res = ostree_repo_pull_with_options (self, remote_name, options, progress, cancellable, error); - if (res && dirs_to_pull != NULL) - { - /* This works around an issue with ostree where it doesn't pull - * all dependencies (stops are first locally available object) - * unless the commit itself is a commitpartial: - * https://github.com/ostreedev/ostree/issues/543 - * The workaround works by pulling again, and on the new pull - * the commit *will* have a commitpartial. - */ - res = ostree_repo_pull_with_options (self, remote_name, options, - progress, cancellable, error); - } return res; } diff --git a/configure.ac b/configure.ac index 8a66ff69..e0b2b7f6 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_INIT([Flatpak], GLIB_REQS=2.40 SYSTEM_BWRAP_REQS=0.1.2 -OSTREE_REQS=2016.12 +OSTREE_REQS=2016.14 AC_USE_SYSTEM_EXTENSIONS