summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2018-03-27 11:10:38 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-03-27 10:48:49 +0000
commit1840a7189c32c863a2a5046b14981744da38192b (patch)
tree88e4cdbceb98ce588260187f8ec682b15cbb8bc9
parent148b0ca24517cd521e5d8bf8911dc6019da26ef6 (diff)
downloadflatpak-1840a7189c32c863a2a5046b14981744da38192b.tar.gz
build-commit-from: Don't critical if commit has no commitmeta
Closes: #1524 Approved by: alexlarsson
-rw-r--r--app/flatpak-builtins-build-commit-from.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/flatpak-builtins-build-commit-from.c b/app/flatpak-builtins-build-commit-from.c
index 0838219d..759dec81 100644
--- a/app/flatpak-builtins-build-commit-from.c
+++ b/app/flatpak-builtins-build-commit-from.c
@@ -167,7 +167,8 @@ rewrite_delta (OstreeRepo *src_repo,
g_variant_dict_init (&dst_metadata_dict, src_metadata);
g_variant_dict_remove (&dst_metadata_dict, src_detached_key);
- if (ostree_repo_read_commit_detached_metadata (dst_repo, dst_commit, &dst_detached, NULL, NULL))
+ if (ostree_repo_read_commit_detached_metadata (dst_repo, dst_commit, &dst_detached, NULL, NULL) &&
+ dst_detached != NULL)
g_variant_dict_insert_value (&dst_metadata_dict, dst_detached_key, dst_detached);
g_variant_builder_add_value (&superblock_builder, g_variant_dict_end (&dst_metadata_dict));