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 2024-03-03 20:19:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Sun Mar 3 20:19:08 2024 rev:334 rq:1154077 version:5.0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2024-02-25 14:05:25.987410503 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.1770/yast2-bootloader.changes
2024-03-03 20:19:31.574275258 +0100
@@ -1,0 +2,6 @@
+Mon Feb 26 13:30:54 UTC 2024 - Stefan Schubert <[email protected]>
+
+- Feature: Do not timeout boot menue in systemd-boot. (bsc#1216366)
+- 5.0.6
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-5.0.5.tar.bz2
New:
----
yast2-bootloader-5.0.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.QkCA0V/_old 2024-03-03 20:19:32.354303477 +0100
+++ /var/tmp/diff_new_pack.QkCA0V/_new 2024-03-03 20:19:32.358303622 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.5
+Version: 5.0.6
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
++++++ yast2-bootloader-5.0.5.tar.bz2 -> yast2-bootloader-5.0.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.5/package/yast2-bootloader.changes
new/yast2-bootloader-5.0.6/package/yast2-bootloader.changes
--- old/yast2-bootloader-5.0.5/package/yast2-bootloader.changes 2024-02-23
16:02:02.000000000 +0100
+++ new/yast2-bootloader-5.0.6/package/yast2-bootloader.changes 2024-02-29
11:59:06.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Feb 26 13:30:54 UTC 2024 - Stefan Schubert <[email protected]>
+
+- Feature: Do not timeout boot menue in systemd-boot. (bsc#1216366)
+- 5.0.6
+
+-------------------------------------------------------------------
Tue Feb 20 07:42:45 UTC 2024 - Stefan Schubert <[email protected]>
- Proposal: Trying to take the bootloader which has been defined in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-5.0.5/package/yast2-bootloader.spec
new/yast2-bootloader-5.0.6/package/yast2-bootloader.spec
--- old/yast2-bootloader-5.0.5/package/yast2-bootloader.spec 2024-02-23
16:02:02.000000000 +0100
+++ new/yast2-bootloader-5.0.6/package/yast2-bootloader.spec 2024-02-29
11:59:06.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 5.0.5
+Version: 5.0.6
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.5/src/lib/bootloader/systemdboot.rb
new/yast2-bootloader-5.0.6/src/lib/bootloader/systemdboot.rb
--- old/yast2-bootloader-5.0.5/src/lib/bootloader/systemdboot.rb
2024-02-23 16:02:02.000000000 +0100
+++ new/yast2-bootloader-5.0.6/src/lib/bootloader/systemdboot.rb
2024-02-29 11:59:06.000000000 +0100
@@ -164,12 +164,22 @@
def read_menue_timeout
config = CFA::SystemdBoot.load
- self.menue_timeout = config.menue_timeout.to_i if config.menue_timeout
+ return unless config.menue_timeout
+
+ self.menue_timeout = if config.menue_timeout == "menu-force"
+ -1
+ else
+ config.menue_timeout.to_i
+ end
end
def write_menue_timeout
config = CFA::SystemdBoot.load
- config.menue_timeout = menue_timeout.to_s
+ config.menue_timeout = if menue_timeout == -1
+ "menu-force"
+ else
+ menue_timeout.to_s
+ end
config.save
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.5/src/lib/bootloader/systemdboot_widgets.rb
new/yast2-bootloader-5.0.6/src/lib/bootloader/systemdboot_widgets.rb
--- old/yast2-bootloader-5.0.5/src/lib/bootloader/systemdboot_widgets.rb
2024-02-23 16:02:02.000000000 +0100
+++ new/yast2-bootloader-5.0.6/src/lib/bootloader/systemdboot_widgets.rb
2024-02-29 11:59:06.000000000 +0100
@@ -17,7 +17,7 @@
end
# Represents bootloader timeout value
- class TimeoutWidget < CWM::IntField
+ class TimeoutWidget < CWM::CustomWidget
include SystemdBootHelper
def initialize
@@ -25,27 +25,54 @@
super()
- @minimum = -1
+ @minimum = 0
@maximum = 600
+ @default = 10
end
- attr_reader :minimum, :maximum
+ attr_reader :minimum, :maximum, :default
- def label
- _("&Timeout in Seconds")
+ def contents
+ CheckBoxFrame(
+ Id(:cont_boot),
+ _("Automatically boot the default entry after a timeout"),
+ false,
+ HBox(
+ IntField(Id(:seconds), _("&Timeout in Seconds"), @minimum,
@maximum,
+ systemdboot.menue_timeout.to_i),
+ HStretch()
+ )
+ )
end
def help
- _("<p><b>Timeout in Seconds</b>\n" \
+ _("<p>Continue boot process after defined seconds.</p>" \
+ "<p><b>Timeout in Seconds</b>\n" \
"specifies the time the boot loader will wait until the default
kernel is loaded.</p>\n")
end
def init
- self.value = systemdboot.menue_timeout.to_i
+ Yast::UI.ChangeWidget(Id(:cont_boot), :Value,
systemdboot.menue_timeout >= 0)
+ systemdboot.menue_timeout = default_value if systemdboot.menue_timeout
< 0
+ Yast::UI.ChangeWidget(Id(:seconds), :Value, systemdboot.menue_timeout)
end
def store
- systemdboot.menue_timeout = value.to_s
+ if Yast::UI.QueryWidget(Id(:cont_boot), :Value)
+ systemdboot.menue_timeout = Yast::UI.QueryWidget(Id(:seconds),
:Value)
+ else
+ systemdboot.menue_timeout = -1
+ end
+ end
+
+ private
+
+ def default_value
+ # set default
+ ret = Yast::ProductFeatures.GetIntegerFeature("globals",
+ "boot_timeout").to_i
+ ret = @default if ret <= 0
+ ret
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-5.0.5/test/systemdboot_widgets_test.rb
new/yast2-bootloader-5.0.6/test/systemdboot_widgets_test.rb
--- old/yast2-bootloader-5.0.5/test/systemdboot_widgets_test.rb 2024-02-23
16:02:02.000000000 +0100
+++ new/yast2-bootloader-5.0.6/test/systemdboot_widgets_test.rb 2024-02-29
11:59:06.000000000 +0100
@@ -35,21 +35,31 @@
assign_systemd_bootloader
end
- it_behaves_like "labeled widget"
+ it_behaves_like "CWM::CustomWidget"
- it "has minimal value to -1 as unlimited" do
- expect(subject.minimum).to eq(-1)
+ it "has minimal value to 0 as unlimited" do
+ expect(subject.minimum).to eq(0)
end
it "has maximum value to 600" do
expect(subject.maximum).to eq 600
end
- it "is initialized to timeout value if defined" do
- bootloader.menue_timeout = "10"
- expect(subject).to receive(:value=).with(10)
+ it "has own complex content" do
+ expect(subject.contents).to be_a Yast::Term
+ end
+
+ context "storing content" do
+ before do
+ stub_widget_value(:cont_boot, false)
+ stub_widget_value(:seconds, 15)
+ end
+
+ it "sets timeout to -1 for using menu-force" do
+ subject.store
- subject.init
+ expect(bootloader.menue_timeout).to eq(-1)
+ end
end
end
