From f86a132eb0c0a9ac9212b8471f2e6185a7325f50 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 1 Feb 2014 11:30:10 -0500 Subject: [PATCH] libostree: Also use xattr callback for directories They need labels too, obviously. --- src/libostree/ostree-repo-commit.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index e470b8b7..10d39718 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -1751,7 +1751,12 @@ write_directory_to_mtree_internal (OstreeRepo *self, if (filter_result == OSTREE_REPO_COMMIT_FILTER_ALLOW) { g_debug ("Adding: %s", gs_file_get_path_cached (dir)); - if (!(modifier && (modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS) > 0)) + if (modifier && modifier->xattr_callback) + { + xattrs = modifier->xattr_callback (self, relpath, child_info, + modifier->xattr_user_data); + } + else if (!(modifier && (modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS) > 0)) { if (!gs_file_get_all_xattrs (dir, &xattrs, cancellable, error)) goto out;