From 9b369de50c2ad5a281fb0ff84fcb7988f26c224f Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 7 Dec 2021 18:38:43 +0100
Subject: [PATCH] raise OpenPypeVersionNotFound in run from code too

---
 start.py | 57 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/start.py b/start.py
index 5f416a47b8..69774c3a6c 100644
--- a/start.py
+++ b/start.py
@@ -769,45 +769,50 @@ def _bootstrap_from_code(use_version, use_staging):
         # get current version of OpenPype
         local_version = bootstrap.get_local_live_version()
 
-    version_to_use = None
     openpype_versions = bootstrap.find_openpype(
         include_zips=True, staging=use_staging)
     if use_staging and not use_version:
-        try:
-            version_to_use = openpype_versions[-1]
-        except IndexError:
-            _print("!!! No staging versions are found.")
-            list_versions(openpype_versions, local_version)
-            sys.exit(1)
+        if not openpype_versions:
+            raise OpenPypeVersionNotFound(
+                "Didn't find any staging versions."
+            )
+
+        # Use last found staging version
+        version_to_use = openpype_versions[-1]
         if version_to_use.path.is_file():
             version_to_use.path = bootstrap.extract_openpype(
                 version_to_use)
         bootstrap.add_paths_from_directory(version_to_use.path)
         os.environ["OPENPYPE_VERSION"] = str(version_to_use)
         version_path = version_to_use.path
-        os.environ["OPENPYPE_REPOS_ROOT"] = (version_path / "openpype").as_posix()  # noqa: E501
+        os.environ["OPENPYPE_REPOS_ROOT"] = (
+            version_path / "openpype"
+        ).as_posix()
         _openpype_root = version_to_use.path.as_posix()
 
     elif use_version and use_version != local_version:
-        v: OpenPypeVersion
-        found = [v for v in openpype_versions if str(v) == use_version]
-        if found:
-            version_to_use = sorted(found)[-1]
+        version_to_use = None
+        for version in openpype_versions:
+            if str(version) == use_version:
+                version_to_use = version
+                break
 
-        if version_to_use:
-            # use specified
-            if version_to_use.path.is_file():
-                version_to_use.path = bootstrap.extract_openpype(
-                    version_to_use)
-            bootstrap.add_paths_from_directory(version_to_use.path)
-            os.environ["OPENPYPE_VERSION"] = use_version
-            version_path = version_to_use.path
-            os.environ["OPENPYPE_REPOS_ROOT"] = (version_path / "openpype").as_posix()  # noqa: E501
-            _openpype_root = version_to_use.path.as_posix()
-        else:
-            _print(f"!!! Requested version {use_version} was not found.")
-            list_versions(openpype_versions, local_version)
-            sys.exit(1)
+        if version_to_use is None:
+            raise OpenPypeVersionNotFound(
+                "Requested version \"{}\" was not found.".format(use_version)
+            )
+
+        # use specified
+        if version_to_use.path.is_file():
+            version_to_use.path = bootstrap.extract_openpype(
+                version_to_use)
+        bootstrap.add_paths_from_directory(version_to_use.path)
+        os.environ["OPENPYPE_VERSION"] = use_version
+        version_path = version_to_use.path
+        os.environ["OPENPYPE_REPOS_ROOT"] = (
+            version_path / "openpype"
+        ).as_posix()
+        _openpype_root = version_to_use.path.as_posix()
     else:
         os.environ["OPENPYPE_VERSION"] = local_version
         version_path = Path(_openpype_root)