From 09785449edd55b151bfca76b074944944be3760d Mon Sep 17 00:00:00 2001 From: Demi Marie Obenour Date: Thu, 26 Nov 2020 11:17:33 -0500 Subject: [PATCH] Return better error messages from file pool A `qubes.storage.StoragePoolException` will be returned as a useful error from `qvm-backup`. --- qubes/storage/file.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qubes/storage/file.py b/qubes/storage/file.py index 00293494..83bd0ce3 100644 --- a/qubes/storage/file.py +++ b/qubes/storage/file.py @@ -271,9 +271,9 @@ class FileVolume(qubes.storage.Volume): if self._export_lock is not None: assert self._export_lock is FileVolume._marker_running, \ 'nested calls to export()' - self._not_implemented('exporting a starting volume') + raise qubes.storage.StoragePoolException('file pool cannot export running volumes') if self.is_dirty(): - self._not_implemented('exporting a dirty volume') + raise qubes.storage.StoragePoolException('file pool cannot export dirty volumes') self._export_lock = FileVolume._marker_exported return self.path @@ -327,7 +327,7 @@ class FileVolume(qubes.storage.Volume): if self._export_lock is not None: assert self._export_lock is FileVolume._marker_exported, \ 'nested calls to start()' - self._not_implemented('starting a VM with an exported volume') + raise qubes.storage.StoragePoolException('file pool cannot start a VM with an exported volume') self._export_lock = FileVolume._marker_running if not self.save_on_stop and not self.snap_on_start: self.reset()