Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage/file: use proper exception instead of assert

Browse Source 
Return readable message to the user.
This commit is contained in:
Marek Marczykowski-Górecki 2018-03-21 01:48:20 +01:00
parent 510fad9163
commit 5eceff84cb
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubes/storage/file.py
View File

@ -261,9 +261,10 @@ class FileVolume(qubes.storage.Volume):
return self.path return self.path
def import_volume(self, src_volume): def import_volume(self, src_volume):
msg = "Can not import snapshot volume {!s} in to pool {!s} " if src_volume.snap_on_start:
msg = msg.format(src_volume, self) raise qubes.storage.StoragePoolException(
assert not src_volume.snap_on_start, msg "Can not import snapshot volume {!s} in to pool {!s} ".format(
src_volume, self))
if self.save_on_stop: if self.save_on_stop:
_remove_if_exists(self.path) _remove_if_exists(self.path)
copy_file(src_volume.export(), self.path) copy_file(src_volume.export(), self.path)