From 87a2947d98497bf622519fcff4d05dc24231fb8b Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 29 Sep 2017 20:05:41 +0000 Subject: [PATCH] fixup! lib/commit: don't query devino cache for modified files --- src/libostree/ostree-repo-commit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 41d94e437e..c4484f44b9 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -2377,12 +2377,13 @@ get_final_xattrs (OstreeRepo *self, { /* track whether the returned xattrs differ from the file on disk */ gboolean modified = TRUE; + const gboolean skip_xattrs = (modifier && + modifier->flags & (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS | + OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS)) > 0; /* fetch on-disk xattrs if needed & not disabled */ g_autoptr(GVariant) original_xattrs = NULL; - if (!(modifier && (modifier->flags & (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS | - OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS)) > 0) - && !self->disable_xattrs) + if (!skip_xattrs && !self->disable_xattrs) { if (path && OSTREE_IS_REPO_FILE (path)) {