commit e5f6f20968e546ebabd68c1800e915a0503f44cb parent 40864126d58eb82911a3ba89a557aaa90ed51312 Author: James McCoy <jamessan@jamessan.com> Date: Mon, 2 May 2022 06:24:54 -0400 Merge pull request #18356 from dundargoc/ci/gen_vimdoc/conda-edge-case build(gen_vimdoc): handle conda edge case when parsing doxygen version Diffstat:
| M | scripts/gen_vimdoc.py | | | 5 | +++-- |
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/gen_vimdoc.py b/scripts/gen_vimdoc.py @@ -60,10 +60,11 @@ if sys.version_info < MIN_PYTHON_VERSION: sys.exit(1) doxygen_version = tuple([int(i) for i in subprocess.check_output(["doxygen", "-v"], - universal_newlines=True).split('.')]) + universal_newlines=True).split()[0].split('.')]) if doxygen_version < MIN_DOXYGEN_VERSION: - print("requires Doxygen {}.{}.{}+".format(*MIN_DOXYGEN_VERSION)) + print("\nRequires doxygen {}.{}.{}+".format(*MIN_DOXYGEN_VERSION)) + print("Your doxygen version is {}.{}.{}\n".format(*doxygen_version)) sys.exit(1) # DEBUG = ('DEBUG' in os.environ)