From 4efed64a77d88dd4a43c8b3b33fccd3b0e9614cd Mon Sep 17 00:00:00 2001 From: Nitin-Rawat-1 Date: Fri, 17 Feb 2023 11:06:07 +0100 Subject: [PATCH] Fix error submitting job when not using Shaman Fix #104183: Error submitting job to flamenco manager. The bug happened when a user, using filesystem as storage solution, would try to submit the job to the flamenco manager. The user would be shown an Error -> Error packing with BAT: 'Packer' object has no attribute 'actual_checkout_path'. The fix was to account for multiple implementations of the Packer object. Reviewed-on: https://projects.blender.org/studio/flamenco/pulls/104184 --- addon/flamenco/bat/interface.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addon/flamenco/bat/interface.py b/addon/flamenco/bat/interface.py index 4a26804a..a6f92a8e 100644 --- a/addon/flamenco/bat/interface.py +++ b/addon/flamenco/bat/interface.py @@ -48,10 +48,10 @@ class MsgProgress(Message): @dataclass class MsgDone(Message): output_path: Path - """Path of the submitted blend file, relative to the Shaman checkout root.""" - actual_checkout_path: PurePosixPath """Shaman checkout path, i.e. the root of the job files, relative to the Shaman checkout root.""" missing_files: list[Path] + """Path of the submitted blend file, relative to the Shaman checkout root.""" + actual_checkout_path: Optional[PurePosixPath] = None # MyPy doesn't understand the way BAT subpackages are imported. @@ -168,8 +168,8 @@ class PackThread(threading.Thread): msg = MsgDone( self.packer.output_path, - self.packer.actual_checkout_path, self.packer.missing_files, + getattr(self.packer, "actual_checkout_path", None), ) self.queue.put(msg)