diff options
| author | Colin Walters <walters@verbum.org> | 2017-09-28 15:41:02 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-09-28 19:59:24 +0000 |
| commit | a7f04a14b584b04389576d3f10fad79b40f466d8 (patch) | |
| tree | 0d59f0fd4ecdd4128a1a315e29e6eb512f6b9353 /src/libostree/ostree-repo-libarchive.c | |
| parent | 6c7302fcdd1d5292e0d2ba815ea7eb02b3d1e871 (diff) | |
| download | ostree-a7f04a14b584b04389576d3f10fad79b40f466d8.tar.gz | |
libarchive: Fix assertion error if used with CANONICAL_PERMISSIONS
I was trying to do a change for rpm-ostree to use
`OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS`
for container builds with `bare-user-only,` but hit an assertion here
ultimtely because we weren't setting `standard::type`.
Rather than hand-rolling `GFileInfo` creation, use the stat buffer conversion
code which is more robust and used in multiple places already.
Closes: #1227
Approved by: jlebon
Diffstat (limited to 'src/libostree/ostree-repo-libarchive.c')
| -rw-r--r-- | src/libostree/ostree-repo-libarchive.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c index 414981df..64d8a503 100644 --- a/src/libostree/ostree-repo-libarchive.c +++ b/src/libostree/ostree-repo-libarchive.c @@ -871,10 +871,14 @@ ostree_repo_import_archive_to_mtree (OstreeRepo *self, if (opts->autocreate_parents && ostree_mutable_tree_get_metadata_checksum (mtree) == NULL) { - glnx_unref_object GFileInfo *fi = g_file_info_new (); - g_file_info_set_attribute_uint32 (fi, "unix::uid", 0); - g_file_info_set_attribute_uint32 (fi, "unix::gid", 0); - g_file_info_set_attribute_uint32 (fi, "unix::mode", DEFAULT_DIRMODE); + /* _ostree_stbuf_to_gfileinfo() only looks at these fields, + * but we use it to ensure it sets all of the relevant GFileInfo + * properties. + */ + struct stat stbuf = { .st_mode = DEFAULT_DIRMODE, + .st_uid = 0, + .st_gid = 0 }; + g_autoptr(GFileInfo) fi = _ostree_stbuf_to_gfileinfo (&stbuf); g_autoptr(GFileInfo) mfi = NULL; (void)_ostree_repo_commit_modifier_apply (self, modifier, "/", |