From 57cc915aa960a67ca47cc7e805a8276ae095ec4e Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 5 Jul 2021 19:27:06 -0700 Subject: [PATCH] updated: clear overlay on exception (#21489) old-commit-hash: a44072753d43dc6bb67e3e326438637bc9a62d20 --- selfdrive/updated.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/selfdrive/updated.py b/selfdrive/updated.py index c5b13594b6..cfe57bee61 100755 --- a/selfdrive/updated.py +++ b/selfdrive/updated.py @@ -92,8 +92,8 @@ def set_consistent_flag(consistent: bool) -> None: consistent_file = Path(os.path.join(FINALIZED, ".overlay_consistent")) if consistent: consistent_file.touch() - elif not consistent and consistent_file.exists(): - consistent_file.unlink() + elif not consistent: + consistent_file.unlink(missing_ok=True) os.sync() @@ -356,8 +356,7 @@ def main(): wait_helper.sleep(30) overlay_init = Path(os.path.join(BASEDIR, ".overlay_init")) - if overlay_init.exists(): - overlay_init.unlink() + overlay_init.unlink(missing_ok=True) first_run = True last_fetch_time = 0 @@ -406,9 +405,11 @@ def main(): returncode=e.returncode ) exception = f"command failed: {e.cmd}\n{e.output}" + overlay_init.unlink(missing_ok=True) except Exception as e: cloudlog.exception("uncaught updated exception, shouldn't happen") exception = str(e) + overlay_init.unlink(missing_ok=True) set_params(new_version, update_failed_count, exception) wait_helper.sleep(60)