commit 7d34f27fa9ffbe9206363129ba37ee2f7d6b5c22
author Soby Mathew <soby.mathew@arm.com> Tue Nov 22 10:32:49 2022 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Nov 22 10:32:49 2022 +0100
tree 9b88b76b097dfa983be846869e78a517641420b0
parent fbf114fb67921aa4456bd57d42d5bf7893123094
parent 8fc82c54bc65bb076173bca8764cd52d53041ca0

Merge "TF-RMM Release v0.2.0" into integration

docs/conf.py

diff --git a/docs/conf.py b/docs/conf.py
index 248b9c0..b865e5b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,14 +18,14 @@
 title = 'User Guide'
 
 try:
-  vregx = re.compile(r'tf-rmm-(?P<GIT_VERSION>v.+?)'
+  vregx = re.compile(r'(?P<RMM_VERSION>v.+?)'
                      r'(-[0-9]+-)?(?P<GIT_SHA>g[a-f0-9]{7,})?$')
   git_result = check_output("git describe --tags --always",
                             shell = True, encoding = 'UTF-8')
   _v = vregx.match(git_result)
-  release = _v.group('GIT_VERSION')
+  version = _v.group('RMM_VERSION')
   if _v.group('GIT_SHA'):
-    version = release + "+" + _v.group('GIT_SHA')[:7]
+    version += "+" + _v.group('GIT_SHA')[:7]
 except:
   version = 'Unknown'