shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-11 09:18:20 +03:00
Code Issues Projects Releases Wiki Activity

lib/sysroot-deploy: Nuke finalize-failure.stamp on successful finalization

Browse Source 
In the unusual case where one is manually finalizing staged deployments,
as can happen in testing, we expect a successful finalization to remove
the failure stamp file.
This commit is contained in:
Jonathan Lebon 2023-04-14 12:11:05 -04:00
parent 90f7c7bd9f
commit 45772ede3e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3573,6 +3573,13 @@ _ostree_sysroot_finalize_staged (OstreeSysroot *self,
g_propagate_error (error, g_steal_pointer (&finalization_error)); g_propagate_error (error, g_steal_pointer (&finalization_error));
return FALSE; return FALSE;
} }
else
{
/* we may have failed in a previous invocation on this boot, but we were
* rerun again (likely manually) and passed this time; nuke any stamp */
if (!glnx_shutil_rm_rf_at (self->boot_fd, _OSTREE_FINALIZE_STAGED_FAILURE_PATH, cancellable, error))
return FALSE;
}
return TRUE; return TRUE;
} }