Merge pull request #532 from yast/prevent_ancestor_crash

Prevent ancestor crash
yast · Aug 21, 2018 · 435f0bd · 435f0bd
2 parents 22aa181 + b5b19f8
commit 435f0bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 21 07:59:53 UTC 2018 - jreidinger@suse.com
+
+- Update: Do not crash in detection of gpt disks when some disk
+  disappear (bsc#1105351 )
+- 4.1.8
+
 -------------------------------------------------------------------
 Wed Aug 15 07:41:01 UTC 2018 - mfilka@suse.com
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.1.7
+Version:        4.1.8
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootStorage.rb b/src/modules/BootStorage.rb
@@ -72,7 +72,7 @@ def gpt_boot_disk?
     # @return [Array<String>] gpt disks only
     def gpt_disks(devices)
       targets = devices.map { |dev_name| staging.find_by_any_name(dev_name) }
-      boot_disks = targets.each_with_object([]) { |t, r| r.concat(stage1_disks_for(t)) }
+      boot_disks = targets.compact.each_with_object([]) { |t, r| r.concat(stage1_disks_for(t)) }
 
       result = boot_disks.select { |disk| disk.gpt? }