From 95af32c44f7e530b3a1d9a7110e2cfc9bc58dee3 Mon Sep 17 00:00:00 2001 From: Rafael Fonseca Date: Mon, 27 Jan 2020 14:01:40 +0100 Subject: [PATCH] fixup! deploy: Keep last deployment version during stage Fix typo --- src/libostree/ostree-sysroot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index b4af635562..ccf276bcb1 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -339,7 +339,7 @@ ostree_sysroot_get_fd (OstreeSysroot *self) * @self: Sysroot * * Can only be invoked after `ostree_sysroot_initialize()`. - * + * * Returns: %TRUE iff the sysroot points to a booted deployment * Since: 2019.7 */ @@ -1753,14 +1753,14 @@ ostree_sysroot_simple_write_deployment (OstreeSysroot *sysroot, { const gchar *booted_version = _ostree_deployment_get_version (booted_deployment, repo, error); - retained_previous_version = (g_strcmp0 (booted_deployment, new_version) != 0); + retained_previous_version = (g_strcmp0 (booted_version, new_version) != 0); } if (!retained_previous_version && merge_deployment) { const gchar *merge_version = _ostree_deployment_get_version (merge_deployment, repo, error); - retained_previous_version = (g_strcmp0 (merge_deployment, new_version) != 0); + retained_previous_version = (g_strcmp0 (merge_version, new_version) != 0); } /* tracks when we come across the booted deployment */