From dea4e5681e5c7af84f571e1cbf16133e76c1d463 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Tue, 3 Mar 2020 15:21:34 -0800 Subject: [PATCH] default values in version.py, fixes #1187 old-commit-hash: 4695b2daa982b5db2322c69ac44d628825245214 --- selfdrive/registration.py | 7 ++++--- selfdrive/version.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/selfdrive/registration.py b/selfdrive/registration.py index bebe054924..5b01d1446f 100644 --- a/selfdrive/registration.py +++ b/selfdrive/registration.py @@ -15,9 +15,10 @@ def register(): params.put("Version", version) params.put("TermsVersion", terms_version) params.put("TrainingVersion", training_version) - params.put("GitCommit", get_git_commit()) - params.put("GitBranch", get_git_branch()) - params.put("GitRemote", get_git_remote()) + + params.put("GitCommit", get_git_commit(default="")) + params.put("GitBranch", get_git_branch(default="")) + params.put("GitRemote", get_git_remote(default="")) params.put("SubscriberInfo", get_subscriber_info()) # create a key for auth diff --git a/selfdrive/version.py b/selfdrive/version.py index 77dc266687..b45fe384bd 100644 --- a/selfdrive/version.py +++ b/selfdrive/version.py @@ -4,28 +4,28 @@ import subprocess from selfdrive.swaglog import cloudlog -def get_git_commit(): +def get_git_commit(default=None): try: return subprocess.check_output(["git", "rev-parse", "HEAD"], encoding='utf8').strip() except subprocess.CalledProcessError: - return None + return default -def get_git_branch(): +def get_git_branch(default=None): try: return subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"], encoding='utf8').strip() except subprocess.CalledProcessError: - return None + return default -def get_git_full_branchname(): +def get_git_full_branchname(default=None): try: return subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"], encoding='utf8').strip() except subprocess.CalledProcessError: - return None + return default -def get_git_remote(): +def get_git_remote(default=None): try: local_branch = subprocess.check_output(["git", "name-rev", "--name-only", "HEAD"], encoding='utf8').strip() tracking_remote = subprocess.check_output(["git", "config", "branch." + local_branch + ".remote"], encoding='utf8').strip() @@ -36,7 +36,7 @@ def get_git_remote(): # Not on a branch, fallback return subprocess.check_output(["git", "config", "--get", "remote.origin.url"], encoding='utf8').strip() except subprocess.CalledProcessError: - return None + return default with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "common", "version.h")) as _versionf: