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

This commit is contained in:
Luca BRUNO 2021-08-23 13:51:55 +00:00
parent 89432b2e2d
commit 0276f4dc0c
No known key found for this signature in database
GPG Key ID: A9834A2252078E4E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-diff.c
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;
} }