1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-18 09:57:40 +03:00

config: appversion: Use +DIRTY to ensure SemVer compliance.

It's also more succinct.  We know what it means.
This commit is contained in:
Athanasius 2021-05-27 09:21:13 +01:00
parent 04c3b20c99
commit 4d5d9ae645

View File

@ -96,7 +96,7 @@ def git_shorthash_from_head() -> str:
""" """
Determine short hash for current git HEAD. Determine short hash for current git HEAD.
Includes -DIRTY if any changes have been made from HEAD Includes +DIRTY if any changes have been made from HEAD
:return: str - None if we couldn't determine the short hash. :return: str - None if we couldn't determine the short hash.
""" """
@ -122,7 +122,7 @@ def git_shorthash_from_head() -> str:
with contextlib.suppress(Exception): with contextlib.suppress(Exception):
result = subprocess.run('git diff --stat HEAD'.split(), capture_output=True) result = subprocess.run('git diff --stat HEAD'.split(), capture_output=True)
if len(result.stdout) > 0: if len(result.stdout) > 0:
shorthash += '-WORKING-DIR-IS-DIRTY' shorthash += '+DIRTY'
if len(result.stderr) > 0: if len(result.stderr) > 0:
logger.warning(f'Data from git on stderr:\n{str(result.stderr)}') logger.warning(f'Data from git on stderr:\n{str(result.stderr)}')