From: Luca BRUNO <luca.bruno@coreos.com>
Date: Mon, 23 Aug 2021 12:39:02 +0000 (+0000)
Subject: lib/diff: ignore xattrs if disabled on either repos
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~2^2~13^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=06ff77cfeb7eef5e75528f787f8c5569cd5b2334;p=ostree.git

lib/diff: ignore xattrs if disabled on either repos

This fixes the logic to detect whether xattrs should be automatically
ignored when diffing.
---

diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c
index da018db4..e2d68d0a 100644
--- a/src/libostree/ostree-diff.c
+++ b/src/libostree/ostree-diff.c
@@ -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,
    * then disable for both.
    */
-  OstreeRepo *repo;
   if (OSTREE_IS_REPO_FILE (a))
-    repo = ostree_repo_file_get_repo ((OstreeRepoFile*)a);
-  else if (OSTREE_IS_REPO_FILE (b))
-    repo = ostree_repo_file_get_repo ((OstreeRepoFile*)b);
-  else
-    repo = NULL;
-  if (repo != NULL && repo->disable_xattrs)
-    flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
+    {
+      OstreeRepo *repo = ostree_repo_file_get_repo ((OstreeRepoFile*)a);
+      if (repo->disable_xattrs)
+        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)
+        flags |= OSTREE_DIFF_FLAGS_IGNORE_XATTRS;
+    }
 
   if (a == NULL)
     {