git_tag can sometimes erroneously be set to a rev try git_rev if avai…

…lable Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
EVerest · Jul 11, 2023 · fde385e · fde385e
1 parent d289097
commit fde385e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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