From de97ff163bc2a01c4ad68bd0dea8a9a6644ab145 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 12 Jul 2017 16:52:46 -1000 Subject: [PATCH] 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 --- Tools/px_update_git_header.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/px_update_git_header.py b/Tools/px_update_git_header.py index 378036848c..95f8a8e6cc 100755 --- a/Tools/px_update_git_header.py +++ b/Tools/px_update_git_header.py @@ -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(),