From: Luca BRUNO <luca.bruno@coreos.com>
Date: Mon, 23 Aug 2021 13:51:55 +0000 (+0000)
Subject: lib/diff: automatically skip xattrs in bare-user-only mode
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~2^2~11^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0276f4dc0c02170b763a796f5811adc2e7dd80ed;p=ostree.git

lib/diff: automatically skip xattrs in bare-user-only mode
---

diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c
index e2d68d0a..a5c02b7b 100644
--- a/src/libostree/ostree-diff.c
+++ b/src/libostree/ostree-diff.c
@@ -271,13 +271,13 @@ ostree_diff_dirs_with_options (OstreeDiffFlags        flags,
   if (OSTREE_IS_REPO_FILE (a))
     {
       OstreeRepo *repo = ostree_repo_file_get_repo ((OstreeRepoFile*)a);
-      if (repo->disable_xattrs)
+      if (repo->disable_xattrs || repo->mode == OSTREE_REPO_MODE_BARE_USER_ONLY)
         flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
     }
   if (OSTREE_IS_REPO_FILE (b))
     {
       OstreeRepo *repo = ostree_repo_file_get_repo ((OstreeRepoFile*)b);
-      if (repo->disable_xattrs)
+      if (repo->disable_xattrs || repo->mode == OSTREE_REPO_MODE_BARE_USER_ONLY)
         flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
     }