From b06f6161729df4c395fb23afbe4e46a7d1b4f09e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 21 Dec 2018 09:43:48 +0100 Subject: [PATCH] Drop unneeded progress reporting When pulling the ostree-metadata branch for p2p remotes we passed NULL for progress which caused it to report with the default console progress, which doesn't make any sense for the (small) ostree-metadata branch. Closes: #2456 Approved by: alexlarsson --- common/flatpak-dir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 0c57451f..142c4e73 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -11854,6 +11854,7 @@ _flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir *self, GCancellable *cancellable, GError **error) { + g_autoptr(OstreeAsyncProgress) progress = ostree_async_progress_new (); FlatpakPullFlags flatpak_flags; gboolean gpg_verify; g_autofree char *checksum_from_summary = NULL; @@ -11954,7 +11955,7 @@ _flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir *self, child_repo, flatpak_flags, OSTREE_REPO_PULL_FLAGS_MIRROR, - NULL, cancellable, error)) + progress, cancellable, error)) return FALSE; if (!child_repo_ensure_summary (child_repo, state, cancellable, error)) @@ -11982,7 +11983,7 @@ _flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir *self, if (!flatpak_dir_pull (self, state, OSTREE_REPO_METADATA_REF, NULL, NULL, NULL, NULL, flatpak_flags, OSTREE_REPO_PULL_FLAGS_NONE, - NULL, cancellable, error)) + progress, cancellable, error)) return FALSE; return TRUE;