don't try to remove existing log vols or vol groups more than once (#104993)

1 files changed, 6 insertions, 2 deletions

diff --git a/partitions.py b/partitions.py
index 878419a51..c37c15d0b 100644
--- a/partitions.py
+++ b/partitions.py
@@ -1207,12 +1207,16 @@ class Partitions:
         # now, go through and delete logical volumes
         for delete in self.deletes:
             if isinstance(delete, partRequests.DeleteLogicalVolumeSpec):
-                lvm.lvremove(delete.name, delete.vg)
+                if not delete.beenDeleted():
+                    lvm.lvremove(delete.name, delete.vg)
+                    delete.setDeleted(1)
 
         # now, go through and delete volume groups
         for delete in self.deletes:
             if isinstance(delete, partRequests.DeleteVolumeGroupSpec):
-                lvm.vgremove(delete.name)
+                if not delete.beenDeleted():
+                    lvm.vgremove(delete.name)
+                    delete.setDeleted(1)
 
         lvm.vgdeactivate()
         diskset.stopAllRaid()