From 71434871b8a473cdb5878576f6048577306c3b11 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 12 Aug 2021 11:39:14 +0200 Subject: [PATCH 1/3] Fix - not changing separator in AVALON_APP_NAME \ was recognized in AVALON_APP_NAME as a path separator and normalized for all OS, currently \ is used in this env var as plain separator, cannot be replaced. --- .../modules/deadline/plugins/publish/submit_nuke_deadline.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index fed98d8a08a..80a264fcd4f 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -264,6 +264,9 @@ def payload_submit(self, self.log.debug("key: {}".format(key)) if "://" in value: clean_path = value + # env var contains now \ separator, dont replace that, its not path + elif key == "AVALON_APP_NAME": + continue else: valid_paths = [] for path in value.split(os.pathsep): From a5c85100f3faf4dabd1b5e74f887de50edcca721 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 12 Aug 2021 11:40:51 +0200 Subject: [PATCH 2/3] Fix - not changing separator in AVALON_APP_NAME \ was recognized in AVALON_APP_NAME as a path separator and normalized for all OS, currently \ is used in this env var as plain separator, cannot be replaced. --- .../deadline/plugins/publish/submit_nuke_deadline.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index 80a264fcd4f..4f4f9240542 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -262,11 +262,9 @@ def payload_submit(self, for key, value in environment.items(): clean_path = "" self.log.debug("key: {}".format(key)) - if "://" in value: - clean_path = value # env var contains now \ separator, dont replace that, its not path - elif key == "AVALON_APP_NAME": - continue + if "://" in value or key == "AVALON_APP_NAME": + clean_path = value else: valid_paths = [] for path in value.split(os.pathsep): From 75610ff8392977e561ef9275ea8db5472184f334 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 12 Aug 2021 15:03:51 +0200 Subject: [PATCH 3/3] daedline nuke: removing obsolete code --- .../plugins/publish/submit_nuke_deadline.py | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index 4f4f9240542..d6290251baf 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -252,40 +252,11 @@ def payload_submit(self, environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **api.Session) - # self.log.debug("enviro: {}".format(pprint(environment))) for _path in os.environ: if _path.lower().startswith('openpype_'): environment[_path] = os.environ[_path] - clean_environment = {} - for key, value in environment.items(): - clean_path = "" - self.log.debug("key: {}".format(key)) - # env var contains now \ separator, dont replace that, its not path - if "://" in value or key == "AVALON_APP_NAME": - clean_path = value - else: - valid_paths = [] - for path in value.split(os.pathsep): - if not path: - continue - try: - path.decode('UTF-8', 'strict') - valid_paths.append(os.path.normpath(path)) - except UnicodeDecodeError: - print('path contains non UTF characters') - - if valid_paths: - clean_path = os.pathsep.join(valid_paths) - - if key == "PYTHONPATH": - clean_path = clean_path.replace('python2', 'python3') - - self.log.debug("clean path: {}".format(clean_path)) - clean_environment[key] = clean_path - - environment = clean_environment # to recognize job from PYPE for turning Event On/Off environment["OPENPYPE_RENDER_JOB"] = "1"