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

deploy: Return staged deployment 

Today rpm-ostree has some code to run a "sanitycheck" on a deployment.
I had initially deleted that when adapting it to use the staging code,
but I realized it should work fine; we just won't see the merged
config, but that's OK.

When I readded that code it started crashing because we didn't
actually return the new deployment object.  We'll gain some coverage
here as I'll land the code to have rpm-ostree use staging, then bump
the rpm-ostree tests here.

Closes: #1559
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-04-27 15:33:02 -04:00 committed by Atomic Bot
parent 06d39efcb5
commit cd17e364ae
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libostree/ostree-sysroot-deploy.c
View File

@ -2736,6 +2736,7 @@ ostree_sysroot_stage_tree (OstreeSysroot *self,
if (!ostree_sysroot_load (self, cancellable, error)) if (!ostree_sysroot_load (self, cancellable, error))
return FALSE; return FALSE;
ot_transfer_out_value (out_new_deployment, &deployment);
return TRUE; return TRUE;
} }

2
src/ostree/ot-admin-builtin-deploy.c
View File

@ -178,12 +178,14 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeCommandInvocation *invocat
if (!ostree_sysroot_stage_tree (sysroot, opt_osname, revision, origin, merge_deployment, if (!ostree_sysroot_stage_tree (sysroot, opt_osname, revision, origin, merge_deployment,
kargs_strv, &new_deployment, cancellable, error)) kargs_strv, &new_deployment, cancellable, error))
return FALSE; return FALSE;
g_assert (new_deployment);
} }
else else
{ {
if (!ostree_sysroot_deploy_tree (sysroot, opt_osname, revision, origin, merge_deployment, if (!ostree_sysroot_deploy_tree (sysroot, opt_osname, revision, origin, merge_deployment,
kargs_strv, &new_deployment, cancellable, error)) kargs_strv, &new_deployment, cancellable, error))
return FALSE; return FALSE;
g_assert (new_deployment);
OstreeSysrootSimpleWriteDeploymentFlags flags = OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN; OstreeSysrootSimpleWriteDeploymentFlags flags = OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN;
if (opt_retain) if (opt_retain)