Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compute environments after merge envs

Browse source
This commit is contained in:
iLLiCiTiT 2021-08-03 17:49:21 +02:00
parent 3ea8a09af1
commit 0e2bf5f522
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openpype/lib/applications.py
View file

@ -1138,7 +1138,8 @@ def prepare_host_environments(data, implementation_envs=True):
# Merge dictionaries
env_values = _merge_env(tool_env, env_values)
loaded_env = _merge_env(acre.compute(env_values), data["env"])
merged_env = _merge_env(computed_env, data["env"])
loaded_env = acre.compute(merged_env, cleanup=False)
final_env = None
# Add host specific environments
@ -1189,7 +1190,10 @@ def apply_project_environments_value(project_name, env, project_settings=None):
env_value = project_settings["global"]["project_environments"]
if env_value:
env.update(_merge_env(acre.parse(env_value), env))
env.update(acre.compute(
_merge_env(acre.parse(env_value), env),
cleanup=False
))
return env

6
start.py
View file

@ -221,10 +221,14 @@ def set_openpype_global_environments() -> None:
all_env = get_environments()
general_env = all_env["global"]
env = acre.merge(
merged_env = acre.merge(
acre.parse(general_env),
dict(os.environ)
)
env = acre.compute(
merged_env,
cleanup=False
)
os.environ.clear()
os.environ.update(env)