mirror of
https://github.com/ostreedev/ostree.git
synced 2025-01-11 09:18:20 +03:00
lib/sysroot-deploy: Nuke finalize-failure.stamp
on successful finalization
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:
parent
90f7c7bd9f
commit
45772ede3e
@ -3573,6 +3573,13 @@ _ostree_sysroot_finalize_staged (OstreeSysroot *self,
|
||||
g_propagate_error (error, g_steal_pointer (&finalization_error));
|
||||
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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user