dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

NuttX/nuttx got tagged and broke git version version exraction 

This is part one of a fix for cascading failure. The NuttX
  nuttx repos was tagged with upstream_7.18+ and broke the tag
  extraction that was expecting nuttx-M.mm
This commit is contained in:
David Sidrane 2017-07-12 16:52:46 -10:00 committed by Beat Küng
parent eeb1895922
commit de97ff163b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/px_update_git_header.py
View File

@ -23,7 +23,7 @@ try:
except:
git_branch_name = ''
git_version_short = git_version[0:16]
nuttx_git_tag = subprocess.check_output('git describe --always --tags --dirty'.split(),
nuttx_git_tag = subprocess.check_output('git describe --always --tags --match nuttx-* --dirty'.split(),
cwd='NuttX/nuttx', stderr=subprocess.STDOUT).decode('utf-8').strip().replace("nuttx-","v")
nuttx_git_tag = re.sub('-.*','.0',nuttx_git_tag)
nuttx_git_version = subprocess.check_output('git rev-parse --verify HEAD'.split(),