From 6e8d7d42016514698a7eed0644ea30a699771fc4 Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Sun, 9 Sep 2018 20:01:19 +0000 Subject: [PATCH] storage/reflink: no-op import_volume() if not save_on_stop Instead of raising a NotImplementedError, just return self like 'file' and lvm_thin. This is needed when Storage.clone() is modified in another commit* to no longer swallow exceptions. * "storage: factor out _wait_and_reraise(); fix clone/create" --- qubes/storage/reflink.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qubes/storage/reflink.py b/qubes/storage/reflink.py index 264a8b5d..8b169c92 100644 --- a/qubes/storage/reflink.py +++ b/qubes/storage/reflink.py @@ -276,7 +276,8 @@ class ReflinkVolume(qubes.storage.Volume): return self def import_volume(self, src_volume): - self._require_save_on_stop('import_volume') + if not self.save_on_stop: + return self try: _copy_file(src_volume.export(), self._path_import) except: