Update from code review

Co-Authored-By: Ancor González Sosa <ancor@suse.de> Co-Authored-By: David Díaz González <dgonzalez@suse.de>
yast · Apr 10, 2019 · 8028aec · 8028aec
1 parent 611c6c6
commit 8028aec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
@@ -1,9 +1,8 @@
 -------------------------------------------------------------------
 Wed Apr 10 07:55:26 UTC 2019 - David Diaz <dgonzalez@suse.com>
 
-- Fix partitioner to not have not doable operations after editing
-  a partition that initially contains an LvmPv not associated with
-  any LvmVg (bsc#1129663).
+- Partitioner: when editing a block device, clean-up useless
+  LVM PV metadata from it (bsc#1129663)
 - 4.1.81
 
 -------------------------------------------------------------------

diff --git a/src/lib/y2partitioner/actions/controllers/filesystem.rb b/src/lib/y2partitioner/actions/controllers/filesystem.rb
@@ -351,12 +351,10 @@ def finish
         # Removes from the block device or its encryption layer a LvmPv not associated to an LvmVg
         # (bsc#1129663)
         def remove_unused_lvm_pv
-          device = blk_device.encryption ? blk_device.encryption : blk_device
+          device = blk_device.encryption || blk_device
           lvm_pv = device.lvm_pv
 
-          return unless device.lvm_pv
-
-          device.remove_descendants if lvm_pv.descendants.empty?
+          device.remove_descendants if lvm_pv && lvm_pv.descendants.none?
         end
 
         # Whether is possible to define the generic format options for the current