From a84ddaecf1978fd5a812a2fb284a83f3669ba3ac Mon Sep 17 00:00:00 2001 From: Jack Huang Date: Wed, 16 Feb 2022 21:30:54 +0800 Subject: [PATCH] statsd: fix crash if there is no git repository (#23775) * fix crash if there is no git repository * return default Co-authored-by: Willem Melching --- selfdrive/version.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/selfdrive/version.py b/selfdrive/version.py index f2570cd30..9b18edc43 100644 --- a/selfdrive/version.py +++ b/selfdrive/version.py @@ -55,11 +55,15 @@ def get_origin(default: Optional[str] = None) -> Optional[str]: @cache def get_normalized_origin(default: Optional[str] = None) -> Optional[str]: - return get_origin()\ - .replace("git@", "", 1)\ - .replace(".git", "", 1)\ - .replace("https://", "", 1)\ - .replace(":", "/", 1) + origin = get_origin() + + if origin is None: + return default + + return origin.replace("git@", "", 1) \ + .replace(".git", "", 1) \ + .replace("https://", "", 1) \ + .replace(":", "/", 1) @cache