From 00ea737307da1af989fb7770e8212142a9853f25 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 26 Jul 2021 10:40:46 +0200 Subject: [PATCH] start.py can use `get_general_environments` if is available --- start.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/start.py b/start.py index 1b5c25ae3a..419a956835 100644 --- a/start.py +++ b/start.py @@ -208,14 +208,21 @@ def set_openpype_global_environments() -> None: """Set global OpenPype's environments.""" import acre - from openpype.settings import get_environments + try: + from openpype.settings import get_general_environments - all_env = get_environments() + general_env = get_general_environments() + + except Exception: + # Backwards compatibility for OpenPype versions where + # `get_general_environments` does not exists yet + from openpype.settings import get_environments + + all_env = get_environments() + general_env = all_env["global"] - # TODO Global environments will be stored in "general" settings so loading - # will be modified and can be done in igniter. env = acre.merge( - acre.parse(all_env["global"]), + acre.parse(general_env), dict(os.environ) ) os.environ.clear()