Merge pull request #691 from yast/fix_nil_factory

Fix nil factory
yast · Jan 11, 2024 · a964b05 · a964b05
2 parents b3328c2 + ff1d2ee
commit a964b05
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 10 23:16:39 UTC 2024 - Josef Reidinger <[email protected]>
+
+- Do not try finding undefined bootloader name to avoid error
+  in logs (bsc#1218700)
+- 4.6.5
+
 -------------------------------------------------------------------
 Thu Sep  7 13:44:17 UTC 2023 - Josef Reidinger <[email protected]>
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.6.4
+Version:        4.6.5
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

diff --git a/src/lib/bootloader/bootloader_factory.rb b/src/lib/bootloader/bootloader_factory.rb
@@ -32,7 +32,10 @@ def proposed
       end
 
       def system
-        bootloader_by_name(Sysconfig.from_system.bootloader)
+        sysconfig_name = Sysconfig.from_system.bootloader
+        return nil unless sysconfig_name
+
+        bootloader_by_name(sysconfig_name)
       end
 
       def current