From f69e2344193e11608b8028211a6aec47a01af11f Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 26 Apr 2021 20:58:21 -0700 Subject: [PATCH] updated: fix surfacing exceptions and errors (#20754) * updated: fix surfacing exceptions and errors * can't rely on that * unused * ugh pylint * try this * this makes pylint happy Co-authored-by: Comma Device old-commit-hash: 3c9e46d8a2ec3f9c347b0f455f66179c8220c1e2 --- selfdrive/updated.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/selfdrive/updated.py b/selfdrive/updated.py index ad2d880105..6ec0b4208c 100755 --- a/selfdrive/updated.py +++ b/selfdrive/updated.py @@ -281,12 +281,17 @@ def check_git_fetch_result(fetch_txt): def check_for_update() -> Tuple[bool, bool]: setup_git_options(OVERLAY_MERGED) + fetch_output = None try: - git_fetch_output = run(["git", "fetch", "--dry-run"], OVERLAY_MERGED, low_priority=True) - return True, check_git_fetch_result(git_fetch_output) + fetch_output = run(["git", "fetch", "--dry-run"], OVERLAY_MERGED, low_priority=True) + return True, check_git_fetch_result(fetch_output) except subprocess.CalledProcessError: - return False, False + # check for internet + if fetch_output is not None and fetch_output.startswith("fatal: unable to access") and \ + "Could not resolve host:" in str(fetch_output): + return False, False + raise def fetch_update(wait_helper: WaitTimeHelper) -> bool: cloudlog.info("attempting git fetch inside staging overlay")