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

Merge pull request #2417 from lucab/ups/diff-repo-ignore-xattrs 

lib/diff: ignore xattrs if disabled on either repos
This commit is contained in:
Colin Walters 2021-08-23 10:58:36 -04:00 committed by GitHub
parent 2f675cf1b1 06ff77cfeb
commit 452611e4a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libostree/ostree-diff.c
View File

@ -268,15 +268,18 @@ ostree_diff_dirs_with_options (OstreeDiffFlags flags,
/* If we're diffing versus a repo, and either of them have xattrs disabled, /* If we're diffing versus a repo, and either of them have xattrs disabled,
* then disable for both. * then disable for both.
*/ */
OstreeRepo *repo;
if (OSTREE_IS_REPO_FILE (a)) if (OSTREE_IS_REPO_FILE (a))
repo = ostree_repo_file_get_repo ((OstreeRepoFile*)a); {
else if (OSTREE_IS_REPO_FILE (b)) OstreeRepo *repo = ostree_repo_file_get_repo ((OstreeRepoFile*)a);
repo = ostree_repo_file_get_repo ((OstreeRepoFile*)b); if (repo->disable_xattrs)
else flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
repo = NULL; }
if (repo != NULL && repo->disable_xattrs) if (OSTREE_IS_REPO_FILE (b))
flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS; {
OstreeRepo *repo = ostree_repo_file_get_repo ((OstreeRepoFile*)b);
if (repo->disable_xattrs)
flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
}
if (a == NULL) if (a == NULL)
{ {