From 2dd8418cbfad7023870e2fe989080065ce2e05a5 Mon Sep 17 00:00:00 2001 From: Rafael Fonseca Date: Fri, 20 Dec 2019 16:06:06 +0100 Subject: [PATCH] fixup! deployment: add ostree_deployment_get_version API Fix indentation + g_strdup can handle NULL --- src/libostree/ostree-deployment.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-deployment.c b/src/libostree/ostree-deployment.c index 4a0d6efbdb..2c2dc8405f 100644 --- a/src/libostree/ostree-deployment.c +++ b/src/libostree/ostree-deployment.c @@ -79,7 +79,7 @@ _ostree_deployment_get_version (OstreeDeployment *self, gchar *version = NULL; g_autoptr(GVariant) variant = NULL; if (ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, csum, - &variant, error)) + &variant, error)) { g_autoptr(GVariant) metadata = g_variant_get_child_value (variant, 0); g_variant_lookup (metadata, OSTREE_COMMIT_META_KEY_VERSION, "s", &version); @@ -199,8 +199,7 @@ ostree_deployment_clone (OstreeDeployment *self) self->deployserial, self->bootcsum, self->bootserial); - if (self->version) - ret->version = g_strdup (self->version); + ret->version = g_strdup (self->version); new_bootconfig = ostree_bootconfig_parser_clone (self->bootconfig); ostree_deployment_set_bootconfig (ret, new_bootconfig);