From 1387b75d5f4d1242c2ab7f35f8e406564013b848 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 25 Aug 2021 12:36:03 +0200 Subject: [PATCH] Webpublisher - revert mixed up commit --- openpype/lib/applications.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index 19208ff1736..71ab2eac61b 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -1009,7 +1009,7 @@ def __init__(self, data): def get_app_environments_for_context( - project_name, asset_name, task_name, app_name=None, env=None + project_name, asset_name, task_name, app_name, env=None ): """Prepare environment variables by context. Args: @@ -1038,14 +1038,20 @@ def get_app_environments_for_context( "name": asset_name }) + # Prepare app object which can be obtained only from ApplciationManager + app_manager = ApplicationManager() + app = app_manager.applications[app_name] + # Project's anatomy anatomy = Anatomy(project_name) - prep_dict = { + data = EnvironmentPrepData({ "project_name": project_name, "asset_name": asset_name, "task_name": task_name, + "app": app, + "dbcon": dbcon, "project_doc": project_doc, "asset_doc": asset_doc, @@ -1053,15 +1059,7 @@ def get_app_environments_for_context( "anatomy": anatomy, "env": env - } - - if app_name: - # Prepare app object which can be obtained only from ApplicationManager - app_manager = ApplicationManager() - app = app_manager.applications[app_name] - prep_dict["app"] = app - - data = EnvironmentPrepData(prep_dict) + }) prepare_host_environments(data) prepare_context_environments(data)