From 425d9937692bc6f7ebbc4a277f0eeb51c8be17c9 Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Mon, 29 Oct 2018 20:21:39 +0000 Subject: [PATCH] storage/reflink: unblock import_data() and import_data_end() --- qubes/storage/reflink.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qubes/storage/reflink.py b/qubes/storage/reflink.py index 3f250011..262573ec 100644 --- a/qubes/storage/reflink.py +++ b/qubes/storage/reflink.py @@ -279,6 +279,7 @@ class ReflinkVolume(qubes.storage.Volume): 'Cannot export: {} is not save_on_stop'.format(self.vid)) return self._path_clean + @_unblock def import_data(self): if not self.save_on_stop: raise NotImplementedError( @@ -286,13 +287,15 @@ class ReflinkVolume(qubes.storage.Volume): _create_sparse_file(self._path_import, self.size) return self._path_import - def import_data_end(self, success): + def _import_data_end(self, success): if success: self._commit(self._path_import) else: _remove_file(self._path_import) return self + import_data_end = _unblock(_import_data_end) + @_unblock def import_volume(self, src_volume): if not self.save_on_stop: @@ -300,9 +303,9 @@ class ReflinkVolume(qubes.storage.Volume): try: _copy_file(src_volume.export(), self._path_import) except: - self.import_data_end(False) + self._import_data_end(False) raise - self.import_data_end(True) + self._import_data_end(True) return self def _path_revision(self, number, timestamp=None):