diff --git a/gitlab_submodule/submodule_commit.py b/gitlab_submodule/submodule_commit.py index ceb3eab..2e4fdb6 100644 --- a/gitlab_submodule/submodule_commit.py +++ b/gitlab_submodule/submodule_commit.py @@ -3,15 +3,11 @@ from os import path from typing import Optional, Union -from gitlab.exceptions import GitlabGetError +from gitlab.exceptions import GitlabGetError, GitlabHttpError from gitlab.v4.objects import Project, ProjectCommit from gitlab_submodule.objects import Commit, Submodule - -logger = logging.getLogger(__name__) - - logger = logging.getLogger(__name__) @@ -54,7 +50,7 @@ def _get_submodule_commit_id( submodule_dir = project.files.get( submodule_path, ref=ref if ref else project.default_branch) - except GitlabGetError: + except (GitlabGetError, GitlabHttpError): raise FileNotFoundError( f'Local submodule path "{submodule_path}" was not found for ' f'project at url "{project.web_url}" - check if your .gitmodules ' diff --git a/gitlab_submodule/submodule_to_project.py b/gitlab_submodule/submodule_to_project.py index 70af4c0..bca4260 100644 --- a/gitlab_submodule/submodule_to_project.py +++ b/gitlab_submodule/submodule_to_project.py @@ -1,10 +1,9 @@ -from typing import List, Optional, Union - import logging import re from posixpath import join, normpath +from typing import List, Optional, Union -from gitlab.exceptions import GitlabGetError +from gitlab.exceptions import GitlabGetError, GitlabHttpError from gitlab.v4.objects import Project, ProjectManager from giturlparse import GitUrlParsed, parse @@ -28,7 +27,7 @@ def submodule_to_project( try: submodule_project = project_manager.get( submodule_project_path_with_namespace) - except GitlabGetError: + except (GitlabGetError, GitlabHttpError): # Repo doesn't actually exist (possible because you can modify # .gitmodules without using `git submodule add`) raise FileNotFoundError(