|
 |
cdedc5 |
From 6cf80f4703e57a819c6adc94b5a98b7c3e4c57d2 Mon Sep 17 00:00:00 2001
|
|
|
cdedc5 |
From: Alexander Larsson <alexl@redhat.com>
|
|
|
cdedc5 |
Date: Fri, 11 Sep 2020 16:47:05 +0200
|
|
|
cdedc5 |
Subject: [PATCH] OCI: Fix progress reporting
|
|
|
cdedc5 |
|
|
|
cdedc5 |
Somewhere during the progress reporting cleanup we lost the progress
|
|
|
cdedc5 |
for OCI pulls, this puts it back.
|
|
|
cdedc5 |
---
|
|
|
cdedc5 |
common/flatpak-progress.c | 3 +++
|
|
|
cdedc5 |
1 file changed, 3 insertions(+)
|
|
|
cdedc5 |
|
|
|
cdedc5 |
diff --git a/common/flatpak-progress.c b/common/flatpak-progress.c
|
|
|
cdedc5 |
index e3b8338c5..a83bcf816 100644
|
|
|
cdedc5 |
--- a/common/flatpak-progress.c
|
|
|
cdedc5 |
+++ b/common/flatpak-progress.c
|
|
|
cdedc5 |
@@ -428,6 +428,7 @@ flatpak_progress_update_oci_pull (FlatpakProgress *self,
|
|
|
cdedc5 |
if (self == NULL)
|
|
|
cdedc5 |
return;
|
|
|
cdedc5 |
|
|
|
cdedc5 |
+ self->requested = n_layers; /* Need to set this to trigger start of progress reporting, see update_status_progress_and_estimating() */
|
|
|
cdedc5 |
self->outstanding_fetches = n_layers - pulled_layers;
|
|
|
cdedc5 |
self->fetched_delta_parts = pulled_layers;
|
|
|
cdedc5 |
self->total_delta_parts = n_layers;
|
|
|
cdedc5 |
@@ -438,6 +439,8 @@ flatpak_progress_update_oci_pull (FlatpakProgress *self,
|
|
|
cdedc5 |
self->total_delta_part_usize = total_size;
|
|
|
cdedc5 |
self->total_delta_superblocks = 0;
|
|
|
cdedc5 |
update_status_progress_and_estimating (self);
|
|
|
cdedc5 |
+
|
|
|
cdedc5 |
+ self->callback (self->status, self->progress, self->estimating, self->user_data);
|
|
|
cdedc5 |
}
|
|
|
cdedc5 |
|
|
|
cdedc5 |
guint32
|