Skip to content

Commit

Permalink
deploy: Return staged deployment
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cgwalters authored and rh-atomic-bot committed Apr 27, 2018
1 parent 06d39ef commit cd17e36
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libostree/ostree-sysroot-deploy.c
Original file line number Diff line number Diff line change
Expand Up @@ -2736,6 +2736,7 @@ ostree_sysroot_stage_tree (OstreeSysroot *self,
if (!ostree_sysroot_load (self, cancellable, error))
return FALSE;

ot_transfer_out_value (out_new_deployment, &deployment);
return TRUE;
}

Expand Down
2 changes: 2 additions & 0 deletions src/ostree/ot-admin-builtin-deploy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
kargs_strv, &new_deployment, cancellable, error))
return FALSE;
g_assert (new_deployment);
}
else
{
if (!ostree_sysroot_deploy_tree (sysroot, opt_osname, revision, origin, merge_deployment,
kargs_strv, &new_deployment, cancellable, error))
return FALSE;
g_assert (new_deployment);

OstreeSysrootSimpleWriteDeploymentFlags flags = OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN;
if (opt_retain)
Expand Down

0 comments on commit cd17e36

Please sign in to comment.