mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-24 16:57:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Require new ostree and drop old workaroung

Browse Source 
OSTree 2016.4 fixes the scanning and purging issues that
forced us to do a double-pull during sudir installs.
This commit is contained in:
Alexander Larsson
2016-11-28 12:25:59 +01:00
parent 8193b9f282
commit c7776d0a6f
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/flatpak-dir.c
View File

@@ -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;
}

2
configure.ac
View File

@@ -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