From 331e9e6ca0636d0a522ab38ece38299e89b52f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 16 Mar 2018 12:41:09 +0100
Subject: [PATCH] Don't show stack trace when BAT Pack was aborted

---
 blender_cloud/flamenco/__init__.py      | 5 +++++
 blender_cloud/flamenco/bat_interface.py | 1 +
 2 files changed, 6 insertions(+)

diff --git a/blender_cloud/flamenco/__init__.py b/blender_cloud/flamenco/__init__.py
index b9038bf..5c0bf3e 100644
--- a/blender_cloud/flamenco/__init__.py
+++ b/blender_cloud/flamenco/__init__.py
@@ -356,6 +356,11 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
             self.report({'ERROR'}, 'Unable to transfer %d files' % len(ex.files_remaining))
             self.quit()
             return None, []
+        except bat_interface.Aborted:
+            self.log.warning('BAT Pack was aborted')
+            self.report({'WARNING'}, 'Aborted Flamenco file packing/transferring')
+            self.quit()
+            return None, []
 
         bpy.context.window_manager.flamenco_status = 'DONE'
         return outfile, missing_sources
diff --git a/blender_cloud/flamenco/bat_interface.py b/blender_cloud/flamenco/bat_interface.py
index 2c92b0c..767ad46 100644
--- a/blender_cloud/flamenco/bat_interface.py
+++ b/blender_cloud/flamenco/bat_interface.py
@@ -17,6 +17,7 @@ log = logging.getLogger(__name__)
 
 _running_packer = None  # type: pack.Packer
 _packer_lock = threading.RLock()
+Aborted = pack.Aborted
 
 
 class BatProgress(progress.Callback):