mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-15 21:52:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

common: Make ostree bug workaround version checked

Browse Source 
The commitstate check in parent dir was fixed in ostree 2017.13,
so we only apply the workaround for previous versions.

Closes: #1131
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2017-10-26 09:32:55 +02:00
committed by Atomic Bot
parent e1ca3c2515
commit cfb34ea888
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/flatpak-dir.c
View File

@@ -6410,11 +6410,16 @@ flatpak_dir_update (FlatpakDir *self,
system_helper = flatpak_dir_get_system_helper (self);
g_assert (system_helper != NULL);
/* If the existing pull is partial, disable static deltas. They can
break, because ostree doesn't look at the parent repo for
commitpartial state. */
if (old_subpaths && old_subpaths[0] != NULL)
flatpak_flags |= FLATPAK_PULL_FLAGS_NO_STATIC_DELTAS;
if (!OSTREE_CHECK_VERSION(2017,13))
{
/* If the existing pull is partial, disable static deltas. They can
* break on ostree < 2017.13 which doesn't look at the parent repo for
* commitpartial state. This was fixed in
* https://github.com/ostreedev/ostree/commit/90ebd48f6aaf45c47b48c44354359f973dcf22a8
*/
if (old_subpaths && old_subpaths[0] != NULL)
flatpak_flags |= FLATPAK_PULL_FLAGS_NO_STATIC_DELTAS;
}
if (!flatpak_dir_ensure_repo (self, cancellable, error))
return FALSE;