manager.py use get_short_branch() for GitBranch param

old-commit-hash: e8d56f241a
commatwo_master
Willem Melching 3 years ago
parent dc2a9fb311
commit 176f552c9e
  1. 6
      selfdrive/manager/manager.py

@ -18,7 +18,7 @@ from selfdrive.manager.process import ensure_running
from selfdrive.manager.process_config import managed_processes from selfdrive.manager.process_config import managed_processes
from selfdrive.athena.registration import register, UNREGISTERED_DONGLE_ID from selfdrive.athena.registration import register, UNREGISTERED_DONGLE_ID
from selfdrive.swaglog import cloudlog, add_file_handler from selfdrive.swaglog import cloudlog, add_file_handler
from selfdrive.version import get_dirty, get_commit, get_version, get_origin, get_branch, \ from selfdrive.version import get_dirty, get_commit, get_version, get_origin, get_short_branch, \
terms_version, training_version, get_comma_remote terms_version, training_version, get_comma_remote
@ -74,7 +74,7 @@ def manager_init():
params.put("TermsVersion", terms_version) params.put("TermsVersion", terms_version)
params.put("TrainingVersion", training_version) params.put("TrainingVersion", training_version)
params.put("GitCommit", get_commit(default="")) params.put("GitCommit", get_commit(default=""))
params.put("GitBranch", get_branch(default="")) params.put("GitBranch", get_short_branch(default=""))
params.put("GitRemote", get_origin(default="")) params.put("GitRemote", get_origin(default=""))
# set dongle id # set dongle id
@ -95,7 +95,7 @@ def manager_init():
if get_comma_remote() and not (os.getenv("NOLOG") or os.getenv("NOCRASH") or PC): if get_comma_remote() and not (os.getenv("NOLOG") or os.getenv("NOCRASH") or PC):
crash.init() crash.init()
crash.bind_user(id=dongle_id) crash.bind_user(id=dongle_id)
crash.bind_extra(dirty=get_dirty(), origin=get_origin(), branch=get_branch(), commit=get_commit(), crash.bind_extra(dirty=get_dirty(), origin=get_origin(), branch=get_short_branch(), commit=get_commit(),
device=HARDWARE.get_device_type()) device=HARDWARE.get_device_type())

Loading…
Cancel
Save