kallithea Changeset - 7feb2281a8b0

Changeset - 7feb2281a8b0

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2019-09-11 23:00:53
mads@kiilerich.com

git: refactor check_git_version

Emphasize the code path where a wrong git version is found.

1 file changed with 15 insertions and 11 deletions:

kallithea/lib/utils.py

0 comments (0 inline, 0 general)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -27,12 +27,13 @@ Original author and date, and relevant c @@
 import datetime
 import logging
 import os
 import re
 import traceback
 from distutils.version import StrictVersion
 import beaker
 from beaker.cache import _cache_decorate
 from tg.i18n import ugettext as _
 from kallithea.lib.exceptions import HgsubversionImportError
@@ @@ -573,44 +574,47 @@ def load_rcextensions(root_path): @@
 #==============================================================================
 # 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
     if it's too old for Kallithea to work properly.
     """
     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
     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
 #===============================================================================
 # CACHE RELATED METHODS
 #===============================================================================

0 comments (0 inline, 0 general)