From ca61a2bd9d5002ac6cdf2371077e15b0c25da2bc Mon Sep 17 00:00:00 2001 From: Guy Shapiro Date: Mon, 21 Aug 2017 09:42:48 +0300 Subject: [PATCH] lib/sysroot: fix placement for not-default deployment When using the OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT flag, the deployment is said to be added after the booted or merge deployment. Fix the condition to do so instead of adding it in the second place. Closes: #1097 Approved by: cgwalters --- src/libostree/ostree-sysroot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index 86a4f37a..e6471ab5 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -1545,7 +1545,7 @@ ostree_sysroot_simple_write_deployment (OstreeSysroot *sysroot, g_ptr_array_add (new_deployments, g_object_ref (deployment)); } - if (!added_new) + if ((!added_new) && is_merge_or_booted) { g_ptr_array_add (new_deployments, g_object_ref (new_deployment)); added_new = TRUE;