Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at 2021-11-28 21:29:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2"
Sun Nov 28 21:29:59 2021 rev:310 rq:933869 version:4.4.23
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2021-11-24
23:54:34.972456793 +0100
+++ /work/SRC/openSUSE:Factory/.autoyast2.new.1895/autoyast2.changes
2021-11-28 21:30:16.898043026 +0100
@@ -1,0 +2,7 @@
+Thu Nov 25 12:56:23 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- During autoupgrade merge the selected product workflow in order
+ to execute 2nd stage modules (bsc#1192437)
+- 4.4.23
+
+-------------------------------------------------------------------
Old:
----
autoyast2-4.4.22.tar.bz2
New:
----
autoyast2-4.4.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.3rCVpQ/_old 2021-11-28 21:30:17.638040658 +0100
+++ /var/tmp/diff_new_pack.3rCVpQ/_new 2021-11-28 21:30:17.642040646 +0100
@@ -22,7 +22,7 @@
%endif
Name: autoyast2
-Version: 4.4.22
+Version: 4.4.23
Release: 0
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
++++++ autoyast2-4.4.22.tar.bz2 -> autoyast2-4.4.23.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.4.22/package/autoyast2.changes
new/autoyast2-4.4.23/package/autoyast2.changes
--- old/autoyast2-4.4.22/package/autoyast2.changes 2021-11-22
18:06:38.000000000 +0100
+++ new/autoyast2-4.4.23/package/autoyast2.changes 2021-11-25
19:08:03.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Nov 25 12:56:23 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- During autoupgrade merge the selected product workflow in order
+ to execute 2nd stage modules (bsc#1192437)
+- 4.4.23
+
+-------------------------------------------------------------------
Mon Nov 22 16:58:45 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
- Do not process the <add-on/> section during the 2nd stage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.4.22/package/autoyast2.spec
new/autoyast2-4.4.23/package/autoyast2.spec
--- old/autoyast2-4.4.22/package/autoyast2.spec 2021-11-22 18:06:38.000000000
+0100
+++ new/autoyast2-4.4.23/package/autoyast2.spec 2021-11-25 19:08:03.000000000
+0100
@@ -22,7 +22,7 @@
%endif
Name: autoyast2
-Version: 4.4.22
+Version: 4.4.23
Release: 0
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/autoyast2-4.4.22/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb
new/autoyast2-4.4.23/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb
--- old/autoyast2-4.4.22/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb
2021-11-22 18:06:38.000000000 +0100
+++ new/autoyast2-4.4.23/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb
2021-11-25 19:08:03.000000000 +0100
@@ -56,12 +56,14 @@
return :abort if UI.PollInput == :abort &&
Popup.ConfirmAbort(:painless)
Progress.NextStage
-
- # configure general settings
-
#
# Set workflow variables
- #
+ # Ensure that we clean product cache to avoid product from control
(bsc#1156058)
+ AutoinstFunctions.reset_product
+ # Merging selected product (bsc#1192437)
+ AutoinstSoftware.merge_product(AutoinstFunctions.selected_product)
+
+ # configure general settings
general_section = Profile.current["general"] || {}
AutoinstGeneral.Import(general_section)
Builtins.y2milestone(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/autoyast2-4.4.22/test/lib/clients/inst_autosetup_upgrade_test.rb
new/autoyast2-4.4.23/test/lib/clients/inst_autosetup_upgrade_test.rb
--- old/autoyast2-4.4.22/test/lib/clients/inst_autosetup_upgrade_test.rb
2021-11-22 18:06:38.000000000 +0100
+++ new/autoyast2-4.4.23/test/lib/clients/inst_autosetup_upgrade_test.rb
2021-11-25 19:08:03.000000000 +0100
@@ -25,11 +25,12 @@
require "y2packager/resolvable"
describe Y2Autoinstallation::Clients::InstAutosetupUpgrade do
+ let(:product_name) { "sled" }
let(:profile) do
Yast::ProfileHash.new(
"general" => {},
"software" => {
- "products" => ["sled"],
+ "products" => [product_name],
"patterns" => ["yast-devel"],
"packages" => ["vim"],
"remove-packages" => ["emacs"],
@@ -40,6 +41,10 @@
)
end
+ let(:product) do
+ Y2Packager::Product.new(name: product_name)
+ end
+
before do
allow(subject).to receive(:probe_storage)
allow(Yast::Packages).to receive(:Init)
@@ -56,6 +61,8 @@
allow(Yast::WFM).to receive(:SetLanguage)
allow(Yast::UI).to receive(:SetLanguage)
allow(Yast::AutoinstFunctions).to
receive(:available_base_products).and_return([])
+ allow(Yast::AutoinstFunctions).to
receive(:selected_product).and_return(product)
+ allow(Yast::AutoinstSoftware).to receive(:merge_product)
allow(Yast::Product).to receive(:FindBaseProducts).and_return([])
allow(Yast::ProductControl).to receive(:RunFrom).and_return(:next)
end
@@ -67,6 +74,12 @@
subject.main
end
+ it "merges the selected product workflow" do
+ expect(Yast::AutoinstSoftware).to receive(:merge_product).with(product)
+
+ subject.main
+ end
+
it "checks if upgrade is supported" do
Yast::RootPart.previousRootPartition = ""
Yast::RootPart.selectedRootPartition = "/dev/sda1"
@@ -96,7 +109,7 @@
end
it "install/removes patterns, products anad packages according to profile"
do
- expect(Yast::Pkg).to receive(:ResolvableInstall).with("sled", :product)
+ expect(Yast::Pkg).to receive(:ResolvableInstall).with(product_name,
:product)
expect(Yast::Pkg).to receive(:ResolvableInstall).with("yast-devel",
:pattern)
expect(Yast::Pkg).to receive(:ResolvableInstall).with("vim", :package)
expect(Yast::Pkg).to receive(:ResolvableRemove).with("emacs", :package)
