Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2025-09-30 17:39:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.11973 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Tue Sep 30 17:39:08 2025 rev:351 rq:1307886 version:5.0.26
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2025-08-14 11:36:22.412207940 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.11973/yast2-bootloader.changes
2025-09-30 17:39:10.181150335 +0200
@@ -1,0 +2,7 @@
+Mon Sep 29 11:27:55 UTC 2025 - Stefan Schubert <[email protected]>
+
+- Update: Reports error if the bootloader is changed to grub2-bls
+ (bnc#1246734).
+- 5.0.26
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-5.0.25.tar.bz2
New:
----
yast2-bootloader-5.0.26.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.uDxXJE/_old 2025-09-30 17:39:12.653254016 +0200
+++ /var/tmp/diff_new_pack.uDxXJE/_new 2025-09-30 17:39:12.677255022 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.25
+Version: 5.0.26
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
++++++ yast2-bootloader-5.0.25.tar.bz2 -> yast2-bootloader-5.0.26.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.25/package/yast2-bootloader.changes
new/yast2-bootloader-5.0.26/package/yast2-bootloader.changes
--- old/yast2-bootloader-5.0.25/package/yast2-bootloader.changes
2025-08-13 16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/package/yast2-bootloader.changes
2025-09-29 16:09:09.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Sep 29 11:27:55 UTC 2025 - Stefan Schubert <[email protected]>
+
+- Update: Reports error if the bootloader is changed to grub2-bls
+ (bnc#1246734).
+- 5.0.26
+
+-------------------------------------------------------------------
Wed Aug 13 09:36:06 UTC 2025 - Stefan Schubert <[email protected]>
- "update nvram" option added in grub2-bls and systemd-boot.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.25/package/yast2-bootloader.spec
new/yast2-bootloader-5.0.26/package/yast2-bootloader.spec
--- old/yast2-bootloader-5.0.25/package/yast2-bootloader.spec 2025-08-13
16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/package/yast2-bootloader.spec 2025-09-29
16:09:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.25
+Version: 5.0.26
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.25/src/lib/bootloader/bls.rb
new/yast2-bootloader-5.0.26/src/lib/bootloader/bls.rb
--- old/yast2-bootloader-5.0.25/src/lib/bootloader/bls.rb 2025-08-13
16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/src/lib/bootloader/bls.rb 2025-09-29
16:09:09.000000000 +0200
@@ -62,13 +62,16 @@
begin
output = Yast::Execute.on_target!(SDBOOTUTIL, "get-timeout", stdout:
:capture).to_i
rescue Cheetah::ExecutionFailed => e
- Yast::Report.Error(
- format(_(
- "Cannot read boot menu timeout:\n" \
- "Command `%{command}`.\n" \
- "Error output: %{stderr}"
- ), command: e.commands.inspect, stderr: e.stderr)
- )
+ error_message = format(_(
+ "Cannot read boot menu timeout:\n" \
+ "Command `%{command}`.\n" \
+ "Error output: %{stderr}"
+ ), command: e.commands.inspect, stderr:
e.stderr)
+ if Yast::Stage.initial && Yast::Mode.update
+ Yast::Report.Warning(error_message)
+ else
+ Yast::Report.Error(error_message)
+ end
output = -2 # -1 will be returned from sdbootutil for menu-force
end
output
@@ -94,13 +97,16 @@
begin
output = Yast::Execute.on_target!(SDBOOTUTIL, "get-default", stdout:
:capture)
rescue Cheetah::ExecutionFailed => e
- Yast::Report.Error(
- format(_(
- "Cannot read default menu:\n" \
- "Command `%{command}`.\n" \
- "Error output: %{stderr}"
- ), command: e.commands.inspect, stderr: e.stderr)
- )
+ error_message = format(_(
+ "Cannot read default menu:\n" \
+ "Command `%{command}`.\n" \
+ "Error output: %{stderr}"
+ ), command: e.commands.inspect, stderr:
e.stderr)
+ if Yast::Stage.initial && Yast::Mode.update
+ Yast::Report.Warning(error_message)
+ else
+ Yast::Report.Error(error_message)
+ end
output = ""
end
output.strip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.25/src/lib/bootloader/bls_sections.rb
new/yast2-bootloader-5.0.26/src/lib/bootloader/bls_sections.rb
--- old/yast2-bootloader-5.0.25/src/lib/bootloader/bls_sections.rb
2025-08-13 16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/src/lib/bootloader/bls_sections.rb
2025-09-29 16:09:09.000000000 +0200
@@ -6,11 +6,14 @@
require "bootloader/bls"
Yast.import "Misc"
+Yast.import "Mode"
+Yast.import "Stage"
module Bootloader
# Represents available sections and handling of default BLS boot entry
class BlsSections
include Yast::Logger
+ include Yast::I18n
# @return [Array<String>] list of all available boot titles
# or an empty array
@@ -20,6 +23,8 @@
attr_reader :default
def initialize
+ textdomain "bootloader"
+
@all = []
@default = ""
end
@@ -60,9 +65,22 @@
# @return [Array] return array of entries or []
def read_entries
- output = Yast::Execute.on_target(
- "/usr/bin/bootctl", "--json=short", "list", stdout: :capture
- )
+ begin
+ output = Yast::Execute.on_target!(
+ "/usr/bin/bootctl", "--json=short", "list", stdout: :capture
+ )
+ rescue Cheetah::ExecutionFailed => e
+ error_message = format(_(
+ "Cannot read boot menu entry:\n" \
+ "Command `%{command}`.\n" \
+ "Error output: %{stderr}"
+ ), command: e.commands.inspect, stderr:
e.stderr)
+ if Yast::Stage.initial && Yast::Mode.update
+ Yast::Report.Warning(error_message)
+ else
+ Yast::Report.Error(error_message)
+ end
+ end
return [] if output.nil?
JSON.parse(output)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.25/src/lib/bootloader/proposal_client.rb
new/yast2-bootloader-5.0.26/src/lib/bootloader/proposal_client.rb
--- old/yast2-bootloader-5.0.25/src/lib/bootloader/proposal_client.rb
2025-08-13 16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/src/lib/bootloader/proposal_client.rb
2025-09-29 16:09:09.000000000 +0200
@@ -36,7 +36,9 @@
# TRANSLATORS: kind of boot. It is term for way how x86_64 can boot
"grub2-efi" => _("EFI boot"),
# TRANSLATORS: kind of boot. It is term for way how can boot.
- "systemd-boot" => _("Systemd boot")
+ "systemd-boot" => _("Systemd boot"),
+ # TRANSLATORS: grub2 adapted bootloader to conform Boot Loader
Specification (BLS).
+ "grub2-bls" => _("grub2 with BLS boot")
}
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.25/test/bls_sections_test.rb
new/yast2-bootloader-5.0.26/test/bls_sections_test.rb
--- old/yast2-bootloader-5.0.25/test/bls_sections_test.rb 2025-08-13
16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/test/bls_sections_test.rb 2025-09-29
16:09:09.000000000 +0200
@@ -13,7 +13,7 @@
allow(Yast::Misc).to receive(:CustomSysconfigRead)
.with("ID_LIKE", "openSUSE", "/etc/os-release")
.and_return("openSUSE")
- allow(Yast::Execute).to receive(:on_target)
+ allow(Yast::Execute).to receive(:on_target!)
.with("/usr/bin/bootctl", "--json=short", "list", stdout: :capture)
.and_return("[{\"title\" : \"openSUSE Tumbleweed\", \"isDefault\" :
true," \
" \"type\" : \"type1\", \"id\" : \"file1.conf\" }," \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.25/test/grub2_bls_test.rb
new/yast2-bootloader-5.0.26/test/grub2_bls_test.rb
--- old/yast2-bootloader-5.0.25/test/grub2_bls_test.rb 2025-08-13
16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/test/grub2_bls_test.rb 2025-09-29
16:09:09.000000000 +0200
@@ -17,6 +17,12 @@
allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
allow(Bootloader::Bls).to receive(:default_menu)
.and_return(subject.sections.default)
+ allow(Yast::Execute).to receive(:on_target!)
+ .with("/usr/bin/bootctl", "--json=short", "list", stdout: :capture)
+ .and_return("[{\"title\" : \"openSUSE Tumbleweed\", \"isDefault\" :
true," \
+ " \"type\" : \"type1\", \"id\" : \"file1.conf\" }," \
+ "{\"title\" : \"Snapper: 20241107\", \"isDefault\" : false,"\
+ " \"type\" : \"type1\", \"id\" : \"file2.conf\"}]")
end
describe "#read" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.25/test/systemdboot_test.rb
new/yast2-bootloader-5.0.26/test/systemdboot_test.rb
--- old/yast2-bootloader-5.0.25/test/systemdboot_test.rb 2025-08-13
16:49:03.000000000 +0200
+++ new/yast2-bootloader-5.0.26/test/systemdboot_test.rb 2025-09-29
16:09:09.000000000 +0200
@@ -24,6 +24,12 @@
.and_return("Snapper: *openSUSE Tumbleweed 20241107")
allow(Bootloader::Bls).to receive(:write_menu_timeout)
.with(subject.timeout)
+ allow(Yast::Execute).to receive(:on_target!)
+ .with("/usr/bin/bootctl", "--json=short", "list", stdout: :capture)
+ .and_return("[{\"title\" : \"openSUSE Tumbleweed\", \"isDefault\" :
true," \
+ " \"type\" : \"type1\", \"id\" : \"file1.conf\" }," \
+ "{\"title\" : \"Snapper: 20241107\", \"isDefault\" : false,"\
+ " \"type\" : \"type1\", \"id\" : \"file2.conf\"}]")
end
describe "#read" do
