diff options
| author | Colin Walters <walters@verbum.org> | 2013-09-26 13:59:08 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-09-26 13:59:08 -0400 |
| commit | 10cf4ccabcd4eb35812a2f781d9eb2aba2506030 (patch) | |
| tree | a34355ccb48ac1f1de5f645606ef9e2cc056ced2 | |
| parent | edcfcd21a3e751f4676c8b19a8356fde36c8a3d1 (diff) | |
| download | ostree-10cf4ccabcd4eb35812a2f781d9eb2aba2506030.tar.gz | |
repo: When adding detached metadata, ensure the objdir exists
We may be creating the commitmeta file before the commit, so we need
to call mkdir(<first two checksum characters>) here too.
| -rw-r--r-- | src/libostree/ostree-repo-commit.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index a2bd263b..fe449561 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -1256,8 +1256,10 @@ GFile * _ostree_repo_get_commit_metadata_loose_path (OstreeRepo *self, const char *checksum) { - gs_free char *commit_path = ostree_get_relative_object_path (checksum, OSTREE_OBJECT_TYPE_COMMIT, FALSE); - return ot_gfile_resolve_path_printf (self->repodir, "%smeta", commit_path); + char buf[_OSTREE_LOOSE_PATH_MAX]; + _ostree_loose_path_with_suffix (buf, checksum, OSTREE_OBJECT_TYPE_COMMIT, self->mode, + "meta"); + return g_file_resolve_relative_path (self->objects_dir, buf); } /** @@ -1328,6 +1330,10 @@ ostree_repo_write_commit_detached_metadata (OstreeRepo *self, gs_unref_object GFile *metadata_path = _ostree_repo_get_commit_metadata_loose_path (self, checksum); + if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, checksum, + cancellable, error)) + goto out; + if (!g_file_replace_contents (metadata_path, g_variant_get_data (metadata), g_variant_get_size (metadata), |