cleaner error output when destroy-incompatible fails

psy0rz · Sep 26, 2023 · e30a393 · e30a393
1 parent f8cd77e
commit e30a393
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/zfs_autobackup/ZfsDataset.py b/zfs_autobackup/ZfsDataset.py
@@ -435,7 +435,9 @@ def from_names(self, names, force_exists=None):
 
     @CachedProperty
     def snapshots(self):
-        """get all snapshots of this dataset"""
+        """get all snapshots of this dataset
+        :rtype: ZfsDataset
+        """
 
         if not self.exists:
             return []
@@ -1023,7 +1025,7 @@ def handle_incompatible_snapshots(self, incompatible_target_snapshots, destroy_i
         what to do
 
         Args:
-            :type incompatible_target_snapshots: list of ZfsDataset
+            :type incompatible_target_snapshots: list[ZfsDataset]
             :type destroy_incompatible: bool
         """
 
@@ -1035,7 +1037,7 @@ def handle_incompatible_snapshots(self, incompatible_target_snapshots, destroy_i
             else:
                 for snapshot in incompatible_target_snapshots:
                     snapshot.verbose("Incompatible snapshot")
-                    snapshot.destroy()
+                    snapshot.destroy(fail_exception=True)
                     self.snapshots.remove(snapshot)
 
                 if len(incompatible_target_snapshots)>0: