packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Delete .commitmeta file on empty metadata 

The API docs for ostree_repo_write_commit_detached_metadata() were
written as though it already behaved that way.

https://bugzilla.gnome.org/746123
This commit is contained in:
Matthew Barnes 2015-03-12 21:17:34 -04:00
parent c732178a43
commit 5a3300fe5b
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libostree/ostree-repo-commit.c
View File

@ -1970,13 +1970,37 @@ ostree_repo_write_commit_detached_metadata (OstreeRepo *self,
gs_unref_object GFile *metadata_path = gs_unref_object GFile *metadata_path =
_ostree_repo_get_commit_metadata_loose_path (self, checksum); _ostree_repo_get_commit_metadata_loose_path (self, checksum);
gs_unref_variant GVariant *normalized = NULL; gs_unref_variant GVariant *normalized = NULL;
gsize normalized_size = 0;
if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, checksum, if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, checksum,
cancellable, error)) cancellable, error))
goto out; goto out;
if (metadata != NULL)
{
normalized = g_variant_get_normal_form (metadata); normalized = g_variant_get_normal_form (metadata);
normalized_size = g_variant_get_size (normalized);
}
if (normalized_size == 0)
{
GError *local_error = NULL;
(void) g_file_delete (metadata_path, cancellable, &local_error);
if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{
g_clear_error (&local_error);
}
else if (local_error != NULL)
{
g_propagate_error (error, local_error);
g_prefix_error (error, "Unable to delete detached metadata: ");
goto out;
}
}
else
{
if (!g_file_replace_contents (metadata_path, if (!g_file_replace_contents (metadata_path,
g_variant_get_data (normalized), g_variant_get_data (normalized),
g_variant_get_size (normalized), g_variant_get_size (normalized),
@ -1986,6 +2010,7 @@ ostree_repo_write_commit_detached_metadata (OstreeRepo *self,
g_prefix_error (error, "Unable to write detached metadata: "); g_prefix_error (error, "Unable to write detached metadata: ");
goto out; goto out;
} }
}
ret = TRUE; ret = TRUE;
out: out: