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 2023-05-07 18:54:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Sun May 7 18:54:28 2023 rev:329 rq:1082906 version:4.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2023-03-04 22:42:52.603654339 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.1533/yast2-bootloader.changes
2023-05-07 18:54:33.096114858 +0200
@@ -1,0 +2,6 @@
+Tue Apr 25 20:22:30 UTC 2023 - Josef Reidinger <[email protected]>
+
+- Do not overwrite user selection during migration (bsc#1210811)
+- 4.6.1
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-4.6.0.tar.bz2
New:
----
yast2-bootloader-4.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.OhLeBb/_old 2023-05-07 18:54:33.800118786 +0200
+++ /var/tmp/diff_new_pack.OhLeBb/_new 2023-05-07 18:54:33.804118808 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.6.0
+Version: 4.6.1
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
++++++ yast2-bootloader-4.6.0.tar.bz2 -> yast2-bootloader-4.6.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.6.0/package/yast2-bootloader.changes
new/yast2-bootloader-4.6.1/package/yast2-bootloader.changes
--- old/yast2-bootloader-4.6.0/package/yast2-bootloader.changes 2023-03-03
15:49:50.000000000 +0100
+++ new/yast2-bootloader-4.6.1/package/yast2-bootloader.changes 2023-04-26
10:22:01.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Apr 25 20:22:30 UTC 2023 - Josef Reidinger <[email protected]>
+
+- Do not overwrite user selection during migration (bsc#1210811)
+- 4.6.1
+
+-------------------------------------------------------------------
Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák <[email protected]>
- Bump version to 4.6.0 (bsc#1208913)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.6.0/package/yast2-bootloader.spec
new/yast2-bootloader-4.6.1/package/yast2-bootloader.spec
--- old/yast2-bootloader-4.6.0/package/yast2-bootloader.spec 2023-03-03
15:49:50.000000000 +0100
+++ new/yast2-bootloader-4.6.1/package/yast2-bootloader.spec 2023-04-26
10:22:01.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.6.0
+Version: 4.6.1
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-4.6.0/src/lib/bootloader/proposal_client.rb
new/yast2-bootloader-4.6.1/src/lib/bootloader/proposal_client.rb
--- old/yast2-bootloader-4.6.0/src/lib/bootloader/proposal_client.rb
2023-03-03 15:49:50.000000000 +0100
+++ new/yast2-bootloader-4.6.1/src/lib/bootloader/proposal_client.rb
2023-04-26 10:22:01.000000000 +0200
@@ -226,7 +226,8 @@
# old one is grub2, but mismatch of EFI and non-EFI (bsc#1081355)
elsif old_bootloader =~ /grub2/ && old_bootloader != current_bl.name
raise MismatchBootloader.new(old_bootloader, current_bl.name)
- elsif !current_bl.proposed? || force_reset
+ elsif force_reset
+ log.warn "forced proposal during migration. Will change existing
config"
# Repropose the type. A regular Reset/Propose is not enough.
# For more details see bnc#872081
Yast::Bootloader.Reset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.6.0/test/bootloader_proposal_client_test.rb
new/yast2-bootloader-4.6.1/test/bootloader_proposal_client_test.rb
--- old/yast2-bootloader-4.6.0/test/bootloader_proposal_client_test.rb
2023-03-03 15:49:50.000000000 +0100
+++ new/yast2-bootloader-4.6.1/test/bootloader_proposal_client_test.rb
2023-04-26 10:22:01.000000000 +0200
@@ -187,17 +187,6 @@
subject.make_proposal({})
end
- it "reproprose from scrach during update if old bootloader is not grub2" do
- allow(Yast::Mode).to receive(:update).and_return(true)
-
- expect(subject).to
receive("old_bootloader").and_return("grub").at_least(:once)
-
- expect(Yast::Bootloader).to receive(:Reset).at_least(:once)
- expect(Bootloader::BootloaderFactory).to
receive(:proposed).and_call_original
-
- subject.make_proposal({})
- end
-
it "do not propose during update if if old bootloader is none" do
allow(Yast::Mode).to receive(:update).and_return(true)
