Merge pull request #279 from shundhammer/huha-fix-raid-crash

Fixed crash in bootloader proposal if previous installation was on software RAID (bsc#955216)
yast · Nov 17, 2015 · 49d6c7c · 49d6c7c
2 parents 77c4c57 + a1cc70b
commit 49d6c7c
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 Nov 17 13:59:40 CET 2015 - shundhammer@suse.de
+
+- Fixed crash in bootloader proposal if previous installation was
+  on software RAID (bsc#955216)
+- 3.1.161
+
 -------------------------------------------------------------------
 Wed Nov 11 11:36:29 UTC 2015 - jreidinger@suse.com
 

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

diff --git a/src/modules/BootStorage.rb b/src/modules/BootStorage.rb
@@ -155,7 +155,7 @@ def InitDiskInfo
         next res if [:CT_LVM, :CT_EVMS].include?(info["type"])
         partitions = info["partitions"]
         # disk do not have to be partitioned, so skip it in such case
-        next unless partitions
+        next res unless partitions
 
         parts = partitions.map do |p|
           raid = p["used_by_type"] == :UB_MD ? p["used_by_device"] : nil