From 556975854b41ba6e9bf6d5124eddf669c4c74e44 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Wed, 26 May 2021 18:49:15 +0200 Subject: [PATCH] remove duplicate versions, print path --- igniter/bootstrap_repos.py | 9 +++++++++ start.py | 14 ++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/igniter/bootstrap_repos.py b/igniter/bootstrap_repos.py index b44689ba89..7c4f8b4b69 100644 --- a/igniter/bootstrap_repos.py +++ b/igniter/bootstrap_repos.py @@ -203,6 +203,12 @@ class OpenPypeVersion(semver.VersionInfo): openpype_version.staging = True return openpype_version + def __hash__(self): + if self.path: + return hash(self.path) + else: + return hash(str(self)) + class BootstrapRepos: """Class for bootstrapping local OpenPype installation. @@ -650,6 +656,9 @@ class BootstrapRepos: v for v in openpype_versions if v.path.suffix != ".zip" ] + # remove duplicates + openpype_versions = list(set(openpype_versions)) + return openpype_versions def process_entered_location(self, location: str) -> Union[Path, None]: diff --git a/start.py b/start.py index 8a375a868d..424c6fe74b 100644 --- a/start.py +++ b/start.py @@ -496,10 +496,9 @@ def _find_frozen_openpype(use_version: str = None, if openpype_versions: print(" - found: ") for v in openpype_versions: - print(f" - {v}") - print(f" - {local_version}") - else: - print(f" - local version {local_version}") + print(f" - {v}: {v.path}") + + print(f" - local version {local_version}") sys.exit(1) # test if latest detected is installed (in user data dir) @@ -577,10 +576,9 @@ def _bootstrap_from_code(use_version): if openpype_versions: print(" - found: ") for v in openpype_versions: - print(f" - {v}") - print(f" - {local_version}") - else: - print(f" - local version {local_version}") + print(f" - {v}: {v.path}") + + print(f" - local version {local_version}") sys.exit(1) else: os.environ["OPENPYPE_VERSION"] = local_version