From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 14 Apr 2023 16:11:05 +0000 (-0400)
Subject: lib/sysroot-deploy: Nuke `finalize-failure.stamp` on successful finalization
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2~2^2~4^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=45772ede3e63b1fffef47860e69f3e1b6d2f56cd;p=ostree.git

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.
---

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 5b126d89..d2056cdf 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -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;
 }