mirror of
https://github.com/searxng/searxng
synced 2024-01-01 18:24:07 +00:00
Merge pull request #2117 from dalf/fix_version_number
Version number follows PEP440 : replace - by +
This commit is contained in:
commit
eed9b09d98
@ -59,7 +59,7 @@ def get_git_url_and_branch():
|
||||
|
||||
|
||||
def get_git_version():
|
||||
git_commit_date_hash = subprocess_run(r"git show -s --date='format:%Y.%m.%d' --format='%cd-%h'")
|
||||
git_commit_date_hash = subprocess_run(r"git show -s --date='format:%Y.%m.%d' --format='%cd+%h'")
|
||||
tag_version = git_version = git_commit_date_hash
|
||||
|
||||
# add "-dirty" suffix if there are uncommited changes except searx/settings.yml
|
||||
@ -67,7 +67,7 @@ def get_git_version():
|
||||
subprocess_run("git diff --quiet -- . ':!searx/settings.yml' ':!utils/brand.env'")
|
||||
except subprocess.CalledProcessError as e:
|
||||
if e.returncode == 1:
|
||||
git_version += "-dirty"
|
||||
git_version += "+dirty"
|
||||
else:
|
||||
logger.warning('"%s" returns an unexpected return code %i', e.returncode, e.cmd)
|
||||
return git_version, tag_version
|
||||
|
Loading…
Reference in New Issue
Block a user