From a60851bd59afe2a36e839e3b3409e9b92ab447d2 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 10 May 2023 18:25:05 +0200 Subject: [PATCH] [fix] version format string generated by 'git show' Newer versions of git [1] do no longer support a format string that includes a minus to remove leading zeros [2]. The format string '%Y.%m.%d' is more version rod. [1] https://github.com/searxng/searxng/issues/2413#issuecomment-1542320387 [2] https://github.com/searxng/searxng/pull/2122/files Closes: https://github.com/searxng/searxng/issues/2413 Signed-off-by: Markus Heiser --- searx/version.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/searx/version.py b/searx/version.py index 9f3de38e9..7a368e366 100644 --- a/searx/version.py +++ b/searx/version.py @@ -59,7 +59,10 @@ 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'") + # Remove leading zero from minor and patch level / replacement of PR-2122 + # which depended on the git version: '2023.05.06+..' --> '2023.5.6+..' + git_commit_date_hash = git_commit_date_hash.replace('.0', '.') tag_version = git_version = git_commit_date_hash # add "+dirty" suffix if there are uncommited changes except searx/settings.yml