From 82da4bb3ba2b1c8b8bdb04de600087c1d8a9a4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Mon, 2 Jan 2023 18:52:00 +0100 Subject: [PATCH] [FIX] estimate-workload: InvalidGitRepositoryError For older Odoo version directories are named openerp. --- .../tools/tools_odoo_module.py | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/odoo_openupgrade_wizard/tools/tools_odoo_module.py b/odoo_openupgrade_wizard/tools/tools_odoo_module.py index d13af25..b248b99 100644 --- a/odoo_openupgrade_wizard/tools/tools_odoo_module.py +++ b/odoo_openupgrade_wizard/tools/tools_odoo_module.py @@ -5,6 +5,7 @@ from pathlib import Path import requests from git import Repo +from git.exc import InvalidGitRepositoryError from loguru import logger from pygount import SourceAnalysis @@ -381,17 +382,27 @@ class OdooModule(object): # - github url set with git+http... # - gitlab url # - if odoo code is not in a odoo folder in the repos.yml file... - if str(addon_path).endswith("odoo/odoo/addons") or str( - addon_path - ).endswith("openupgrade/odoo/addons"): + odoo_odoo_addons = ( + "odoo/odoo/addons", + "odoo/openerp/addons", + "openupgrade/odoo/addons", + "openupgrade/openerp/addons", + ) + odoo_addons = ( + "odoo/addons", + "openupgrade/addons", + ) + if str(addon_path).endswith(odoo_odoo_addons): path = addon_path.parent.parent - elif str(addon_path).endswith("odoo/addons") or str( - addon_path - ).endswith("openupgrade/addons"): + elif str(addon_path).endswith(odoo_addons): path = addon_path.parent else: path = addon_path - repo = Repo(str(path)) + try: + repo = Repo(str(path)) + except InvalidGitRepositoryError as err: + logger.critical(f"{path} is not a Git Repository.") + raise err repository_name = repo.remotes[0].url.replace( "https://github.com/", "" )