packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Luca BRUNO committed 2021-08-24 07:56:18 +00:00
1 parent 89432b2e2d
commit 0276f4dc0c
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/libostree/ostree-diff.c
+2 -2
View File
@@ -271,13 +271,13 @@ ostree_diff_dirs_with_options (OstreeDiffFlags flags,
if (OSTREE_IS_REPO_FILE (a)) if (OSTREE_IS_REPO_FILE (a))
{ {
OstreeRepo *repo = ostree_repo_file_get_repo ((OstreeRepoFile*)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; flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
} }
if (OSTREE_IS_REPO_FILE (b)) if (OSTREE_IS_REPO_FILE (b))
{ {
OstreeRepo *repo = ostree_repo_file_get_repo ((OstreeRepoFile*)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; flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
} }