Skip to content

Commit

Permalink
fixup! deploy: Keep last deployment version during stage
Browse files Browse the repository at this point in the history
Fix typo
  • Loading branch information
r4f4 committed Jan 27, 2020
1 parent 583f49f commit 95af32c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libostree/ostree-sysroot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 95af32c

Please sign in to comment.