diff options
| author | Colin Walters <walters@verbum.org> | 2017-08-23 10:09:44 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-23 14:48:12 +0000 |
| commit | eb6f7c6db83ce384f89a142f173c2c064dad2f33 (patch) | |
| tree | c708c35a5724306decca55ee0762f5c7f2832fb1 /src/libostree/ostree-repo-libarchive.c | |
| parent | 556e2deb93e5af5a60e83da4bec5b218831a513f (diff) | |
| download | ostree-eb6f7c6db83ce384f89a142f173c2c064dad2f33.tar.gz | |
lib/commit: Honor commit filter for libarchive --tar-autocreate-parents
This makes `ostree commit --tree=tar` honor `--owner-uid` and `--owner-gid`
for the root directory.
Prep for further commit filtering work, although mostly for the unit test cases;
this ensures we can use `ostree checkout` after autocreating a root directory.
Closes: #1104
Approved by: jlebon
Diffstat (limited to 'src/libostree/ostree-repo-libarchive.c')
| -rw-r--r-- | src/libostree/ostree-repo-libarchive.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c index 1839a088..8d9e8969 100644 --- a/src/libostree/ostree-repo-libarchive.c +++ b/src/libostree/ostree-repo-libarchive.c @@ -861,7 +861,11 @@ ostree_repo_import_archive_to_mtree (OstreeRepo *self, g_file_info_set_attribute_uint32 (fi, "unix::gid", 0); g_file_info_set_attribute_uint32 (fi, "unix::mode", DEFAULT_DIRMODE); - if (!aic_ensure_parent_dir_with_file_info (&aictx, mtree, "/", fi, NULL, + g_autoptr(GFileInfo) mfi = NULL; + (void)_ostree_repo_commit_modifier_apply (self, modifier, "/", + fi, &mfi); + + if (!aic_ensure_parent_dir_with_file_info (&aictx, mtree, "/", mfi, NULL, cancellable, error)) goto out; } |