packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Guy Shapiro 2017-08-21 09:42:48 +03:00 committed by Atomic Bot
parent 1e5b06be5b
commit ca61a2bd9d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-sysroot.c
View File

@ -1545,7 +1545,7 @@ ostree_sysroot_simple_write_deployment (OstreeSysroot *sysroot,
g_ptr_array_add (new_deployments, g_object_ref (deployment)); 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)); g_ptr_array_add (new_deployments, g_object_ref (new_deployment));
added_new = TRUE; added_new = TRUE;