From 0b68cbae5c064353119c74e32eee5db08e6c3d28 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 25 Oct 2022 16:49:13 +0200 Subject: [PATCH] added cleanup of additional arguments --- openpype/tools/tray/pype_tray.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index a49471a944..3a457d2951 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -571,7 +571,9 @@ class TrayManager: if args[-1] == additional_args[0]: additional_args.pop(0) + cleanup_additional_args = False if use_expected_version: + cleanup_additional_args = True expected_version = get_expected_version() if expected_version is not None: reset_version = False @@ -585,8 +587,17 @@ class TrayManager: # Add staging flag if was running from staging if is_running_staging(): args.append("--use-staging") + cleanup_additional_args = True envs.pop("OPENPYPE_VERSION", None) + if cleanup_additional_args: + _additional_args = [] + for arg in additional_args: + if arg == "--use-staging" or arg.startswith("--use-version"): + continue + _additional_args.append(arg) + additional_args = _additional_args + args.extend(additional_args) run_detached_process(args, env=envs)