Sfoglia il codice sorgente

storage/file: use proper exception instead of assert

Return readable message to the user.
Marek Marczykowski-Górecki 6 anni fa
parent
commit
5eceff84cb
1 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 4 3
      qubes/storage/file.py

+ 4 - 3
qubes/storage/file.py

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