Mercurial > kallithea

changeset 7885:7feb2281a8b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git: refactor check_git_version Emphasize the code path where a wrong git version is found.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 11 Sep 2019 23:00:53 +0200
parents 17b86a2976ca
children df275f701d53
files kallithea/lib/utils.py
diffstat 1 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/utils.py	Sun Aug 04 18:53:58 2019 +0200
+++ b/kallithea/lib/utils.py	Wed Sep 11 23:00:53 2019 +0200
@@ -30,6 +30,7 @@
 import os
 import re
 import traceback
+from distutils.version import StrictVersion
 
 import beaker
 from beaker.cache import _cache_decorate
@@ -576,6 +577,8 @@
 # MISC
 #==============================================================================
 
+git_req_ver = StrictVersion('1.7.4')
+
 def check_git_version():
     """
     Checks what version of git is installed in system, and issues a warning
@@ -584,7 +587,6 @@
     from kallithea import BACKENDS
     from kallithea.lib.vcs.backends.git.repository import GitRepository
     from kallithea.lib.vcs.conf import settings
-    from distutils.version import StrictVersion
 
     if 'git' not in BACKENDS:
         return None
@@ -592,22 +594,24 @@
     stdout, stderr = GitRepository._run_git_command(['--version'], _bare=True,
                                                     _safe=True)
 
+    if stderr:
+        log.warning('Error/stderr from "%s --version": %r', settings.GIT_EXECUTABLE_PATH, stderr)
+
     m = re.search(r"\d+.\d+.\d+", stdout)
     if m:
         ver = StrictVersion(m.group(0))
+        log.debug('Git executable: "%s", version %s (parsed from: "%s")',
+                  settings.GIT_EXECUTABLE_PATH, ver, stdout.strip())
+        if ver < git_req_ver:
+            log.warning('Kallithea detected %s version %s, which is too old '
+                        'for the system to function properly. '
+                        'Please upgrade to version %s or later.',
+                        settings.GIT_EXECUTABLE_PATH, ver, git_req_ver)
     else:
         ver = StrictVersion('0.0.0')
-
-    req_ver = StrictVersion('1.7.4')
+        log.warning('Error finding version number in "%s --version" stdout: %r',
+                    settings.GIT_EXECUTABLE_PATH, stdout.strip())
 
-    log.debug('Git executable: "%s" version %s detected: %s',
-              settings.GIT_EXECUTABLE_PATH, ver, stdout)
-    if stderr:
-        log.warning('Error detecting git version: %r', stderr)
-    elif ver < req_ver:
-        log.warning('Kallithea detected git version %s, which is too old '
-                    'for the system to function properly. '
-                    'Please upgrade to version %s or later.' % (ver, req_ver))
     return ver