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

Revert "Revert "extra-data: Simplify extra-data progress setup""

Browse Source 
This reverts commit 2120b99ac6.
This commit is contained in:
Alexander Larsson
2020-04-03 09:32:21 +02:00
parent d276771289
commit 203a10ae25
1 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
common/flatpak-dir.c
View File

@@ -4647,40 +4647,11 @@ flatpak_dir_setup_extra_data (FlatpakDir *self,
/* ostree-metadata and appstreams never have extra data, so ignore those */
if (g_str_has_prefix (ref, "app/") || g_str_has_prefix (ref, "runtime/"))
{
extra_data_sources = flatpak_repo_get_extra_data_sources (repo, rev, cancellable, NULL);
if (extra_data_sources == NULL)
{
/* This is a gigantic hack where we download the commit in a temporary transaction
* which we then abort after having read the result. We do this to avoid creating
* a partial commit in the local repo and a ref that points to it, because that
* causes ostree to not use static deltas.
* See https://github.com/flatpak/flatpak/issues/3412 for details.
*/
g_autoptr(GVariant) commitv = flatpak_remote_state_load_ref_commit (state, self, ref, rev, token, error);
if (commitv == NULL)
return FALSE;
if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))
return FALSE;
/* Pull the commits (and only the commits) to check for extra data
* again. Here we don't pass the progress because we don't want any
* reports coming out of it. */
if (!repo_pull (repo, state,
NULL,
ref,
rev,
sideload_repo,
token,
flatpak_flags,
OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY,
NULL,
cancellable,
error))
return FALSE;
extra_data_sources = flatpak_repo_get_extra_data_sources (repo, rev, cancellable, NULL);
if (!ostree_repo_abort_transaction (repo, cancellable, error))
return FALSE;
}
extra_data_sources = flatpak_commit_get_extra_data_sources (commitv, NULL);
}
n_extra_data = 0;