From fde385ef2743aee0023f4cf4164fe19eb74e7fb0 Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Tue, 11 Jul 2023 16:56:06 +0200 Subject: [PATCH] git_tag can sometimes erroneously be set to a rev try git_rev if available Signed-off-by: Kai-Uwe Hermann --- dependency_manager/src/edm_tool/__init__.py | 2 +- dependency_manager/src/edm_tool/edm.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dependency_manager/src/edm_tool/__init__.py b/dependency_manager/src/edm_tool/__init__.py index 37bd200..bbc9c65 100644 --- a/dependency_manager/src/edm_tool/__init__.py +++ b/dependency_manager/src/edm_tool/__init__.py @@ -4,7 +4,7 @@ # """Everest Dependency Manager.""" from edm_tool import edm -__version__ = "0.5.3" +__version__ = "0.5.4" def get_parser(): diff --git a/dependency_manager/src/edm_tool/edm.py b/dependency_manager/src/edm_tool/edm.py index 413d298..b20eb64 100755 --- a/dependency_manager/src/edm_tool/edm.py +++ b/dependency_manager/src/edm_tool/edm.py @@ -849,6 +849,10 @@ def clone_dependency_repo(git: str, git_tag: str, checkout_dir: Path) -> None: git_rev = git_tag git_tag = None clone_dependency_repo(git, git_tag, checkout_dir) + elif git_rev and git_tag: + log.info(f"Both git_rev and git_tag given, but git_tag \"{git_tag}\" might be a git_rev, trying to checkout git_rev \"{git_rev}\" instead.") + git_tag = None + clone_dependency_repo(git, git_tag, checkout_dir) else: raise e