From 6285826bfc976751b1ee638f9029a486dcca639c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 29 Jul 2021 19:33:36 +0200 Subject: [PATCH] Fix Windows incompatibility when using Shaman URLs as job storage path The Shaman URL check was done on the wrong string, which went unnoticed on Linux because an URL is a valid file path. However, on Windows this is not the case, and thus caused problems. This is now fixed. --- CHANGELOG.md | 5 +++++ blender_cloud/flamenco/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f171c77..ed5fcad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Blender Cloud changelog + +## Version 1.22 (in development) + +- Fix Windows incompatibility when using Shaman URLs as job storage path. + ## Version 1.21 (2021-07-27) - Bump blender-asset-tracer version 1.5.1 → 1.6, for better compatibility with Geometry Nodes. diff --git a/blender_cloud/flamenco/__init__.py b/blender_cloud/flamenco/__init__.py index 3adfa10..cef7ef8 100644 --- a/blender_cloud/flamenco/__init__.py +++ b/blender_cloud/flamenco/__init__.py @@ -271,7 +271,7 @@ def is_file_inside_job_storage(prefs, current_file: typing.Union[str, Path]) -> if isinstance(current_file, str): # Shaman URLs are always remote, so the current file cannot be in there. - if is_shaman_url(current_file): + if is_shaman_url(prefs.flamenco_job_file_path): return False current_file = Path(current_file)