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 e2d68d0ad887f67b23077eae76febd113b3158cb..a5c02b7bfc6e2ca59fc7ac594bd665d1a427ae64 100644 (file)
--- 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;
     }