From f53936f9048a19c7dbfd6901d0e1fc0cfbc3771b Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 27 May 2021 14:35:52 -0700 Subject: [PATCH] Revert "updated: fix surfacing exceptions and errors (#20754)" This reverts commit 07006949d3734b433a8b9de60440523f5e760d88. old-commit-hash: 967489bdaae415aeee3ff73625c16e4b20d7e063 --- selfdrive/updated.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/selfdrive/updated.py b/selfdrive/updated.py index 6ec0b4208c..ad2d880105 100755 --- a/selfdrive/updated.py +++ b/selfdrive/updated.py @@ -281,17 +281,12 @@ def check_git_fetch_result(fetch_txt): def check_for_update() -> Tuple[bool, bool]: setup_git_options(OVERLAY_MERGED) - fetch_output = None try: - fetch_output = run(["git", "fetch", "--dry-run"], OVERLAY_MERGED, low_priority=True) - return True, check_git_fetch_result(fetch_output) + git_fetch_output = run(["git", "fetch", "--dry-run"], OVERLAY_MERGED, low_priority=True) + return True, check_git_fetch_result(git_fetch_output) except subprocess.CalledProcessError: - # 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 + return False, False - raise def fetch_update(wait_helper: WaitTimeHelper) -> bool: cloudlog.info("attempting git fetch inside staging overlay")