From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 19 Jun 2017 09:06:30 +0000 (+0200)
Subject: static delta apply: Work on bare-user-only repos
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~36^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=07dc33ca4a3f2a815143ddab09eb9a7980716c87;p=ostree.git

static delta apply: Work on bare-user-only repos

Flatpak make check is failing when applying a static delta
to a bare-user-only repo due to an assert. The fix is to add
bare-user-only to the assert check.

Closes: #940
Approved by: giuseppe
---

diff --git a/src/libostree/ostree-repo-static-delta-processing.c b/src/libostree/ostree-repo-static-delta-processing.c
index 2280dec9..ea157e77 100644
--- a/src/libostree/ostree-repo-static-delta-processing.c
+++ b/src/libostree/ostree-repo-static-delta-processing.c
@@ -690,7 +690,8 @@ dispatch_open (OstreeRepo                 *repo,
   if (!state->stats_only)
     {
       g_assert (repo->mode == OSTREE_REPO_MODE_BARE ||
-                repo->mode == OSTREE_REPO_MODE_BARE_USER);
+                repo->mode == OSTREE_REPO_MODE_BARE_USER ||
+                repo->mode == OSTREE_REPO_MODE_BARE_USER_ONLY);
     }
   
   if (!open_output_target (state, cancellable, error))