From 75f2c63ced78a09b56cfe6d9f751defe442d0ac6 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Thu, 18 Jan 2018 12:28:36 +0000
Subject: [PATCH] common/dir: Add a missing OstreeAsyncProgress default key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

oci_pull_init_progress() seems to set all the default keys wanted by
ostree_repo_pull_default_console_progress_changed() except the
caught-error key, which was added in OSTree commit 5c4f26bd65b492.

Add that key, just in case something queries for it (if it’s missing
when that happens, an assertion failure will be hit).

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1320
Approved by: cgwalters

(cherry picked from commit 7d1da19de2ba3015dd9ff2cbe68bb8e0ba52117c)
---
 common/flatpak-dir.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index a7e529c7..14ae8797 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -2813,6 +2813,7 @@ oci_pull_init_progress (OstreeAsyncProgress *progress)
                              "total-delta-part-usize", "t", (guint64) 0,
                              "total-delta-superblocks", "u", 0,
                              "status", "s", "",
+                             "caught-error", "b", FALSE,
                              NULL);
 }