summaryrefslogtreecommitdiff
path: root/src/libostree/ostree-repo-commit.c
diff options
context:
space:
mode:
authorLuca BRUNO <luca.bruno@coreos.com>2021-08-23 13:08:44 +0000
committerLuca BRUNO <luca.bruno@coreos.com>2021-08-24 07:56:46 +0000
commit3e2360e3bba6c215acccc77373d01a5674c770e6 (patch)
tree7faf2b946d8fdc5067232bb59565aefdfbfc196b /src/libostree/ostree-repo-commit.c
parentf75552e15ca1afb3ed05b3d16abfcb1e9de3c57d (diff)
downloadostree-3e2360e3bba6c215acccc77373d01a5674c770e6.tar.gz
lib/commit: automatically skip xattrs in bare-user-only mode
Diffstat (limited to 'src/libostree/ostree-repo-commit.c')
-rw-r--r--src/libostree/ostree-repo-commit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 249e792c..d5ab57a2 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -3382,8 +3382,9 @@ 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;
+ (modifier->flags & (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS |
+ OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS)) > 0) ||
+ self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY;
/* fetch on-disk xattrs if needed & not disabled */
g_autoptr(GVariant) original_xattrs = NULL;