Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at 2022-04-30 00:45:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
and /work/SRC/openSUSE:Factory/.yast2-packager.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Sat Apr 30 00:45:07 2022 rev:425 rq:973581 version:4.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes
2022-04-08 00:28:04.138086434 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new.1538/yast2-packager.changes
2022-04-30 00:45:50.374967101 +0200
@@ -1,0 +2,11 @@
+Wed Apr 27 13:31:36 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Don't rely on install.inf availability #(bsc#1198560)
+- 4.5.2
+
+-------------------------------------------------------------------
+Wed Apr 27 11:24:44 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Fixed migration summary in Leap -> SLES migration (bsc#1198562)
+
+-------------------------------------------------------------------
@@ -12 +23 @@
-- Bump version to 4.5.0 (#bsc1198109)
+- Bump version to 4.5.0 (bsc#1198109)
Old:
----
yast2-packager-4.5.1.tar.bz2
New:
----
yast2-packager-4.5.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.ZQqnBu/_old 2022-04-30 00:45:50.918967572 +0200
+++ /var/tmp/diff_new_pack.ZQqnBu/_new 2022-04-30 00:45:50.922967576 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.5.1
+Version: 4.5.2
Release: 0
Summary: YaST2 - Package Library
License: GPL-2.0-or-later
++++++ yast2-packager-4.5.1.tar.bz2 -> yast2-packager-4.5.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.5.1/package/yast2-packager.changes
new/yast2-packager-4.5.2/package/yast2-packager.changes
--- old/yast2-packager-4.5.1/package/yast2-packager.changes 2022-04-07
13:42:53.000000000 +0200
+++ new/yast2-packager-4.5.2/package/yast2-packager.changes 2022-04-28
09:45:08.000000000 +0200
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Wed Apr 27 13:31:36 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Don't rely on install.inf availability #(bsc#1198560)
+- 4.5.2
+
+-------------------------------------------------------------------
+Wed Apr 27 11:24:44 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Fixed migration summary in Leap -> SLES migration (bsc#1198562)
+
+-------------------------------------------------------------------
Thu Apr 7 11:28:48 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
- Show package downloads in the global progress bar during package
@@ -9,7 +20,7 @@
-------------------------------------------------------------------
Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
-- Bump version to 4.5.0 (#bsc1198109)
+- Bump version to 4.5.0 (bsc#1198109)
-------------------------------------------------------------------
Thu Mar 31 15:52:11 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.5.1/package/yast2-packager.spec
new/yast2-packager-4.5.2/package/yast2-packager.spec
--- old/yast2-packager-4.5.1/package/yast2-packager.spec 2022-04-07
13:42:53.000000000 +0200
+++ new/yast2-packager-4.5.2/package/yast2-packager.spec 2022-04-28
09:45:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.5.1
+Version: 4.5.2
Release: 0
Summary: YaST2 - Package Library
License: GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.5.1/src/lib/y2packager/product_spec_reader.rb
new/yast2-packager-4.5.2/src/lib/y2packager/product_spec_reader.rb
--- old/yast2-packager-4.5.1/src/lib/y2packager/product_spec_reader.rb
2022-04-07 13:42:53.000000000 +0200
+++ new/yast2-packager-4.5.2/src/lib/y2packager/product_spec_reader.rb
2022-04-28 09:45:08.000000000 +0200
@@ -27,6 +27,7 @@
class ProductSpecReader
include Yast::Logger
Yast.import "Mode"
+ Yast.import "Linuxrc"
# Returns the list of product specifications.
#
@@ -35,7 +36,7 @@
# products_from_control || products_from_offline || products_from_libzypp
# online migration (in installed system)
- return products_from_libzypp if Yast::Mode.normal
+ return products_from_libzypp if Yast::Mode.normal || !install_inf?
if InstallationMedium.contain_multi_repos?
products_from_multi_repos
@@ -70,5 +71,12 @@
log.info "Products from libzypp: #{libzypp_products.map(&:name).join(",
")}"
libzypp_products
end
+
+ # Is information from an install.inf file available?
+ #
+ # @return [Boolean]
+ def install_inf?
+ !Yast::Linuxrc.keys.empty?
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.5.1/src/lib/y2packager/product_upgrade.rb
new/yast2-packager-4.5.2/src/lib/y2packager/product_upgrade.rb
--- old/yast2-packager-4.5.1/src/lib/y2packager/product_upgrade.rb
2022-04-07 13:42:53.000000000 +0200
+++ new/yast2-packager-4.5.2/src/lib/y2packager/product_upgrade.rb
2022-04-28 09:45:08.000000000 +0200
@@ -47,6 +47,9 @@
# (installed) openSUSE Leap => (available) SLES,
# same as above, in 15.3+ the product has been renamed from "openSUSE"
to "Leap"
["Leap"] =>
"SLES"
+
+ # NOTE: if you change anything here then check the
DEFAULT_PRODUCT_RENAMES value
+ # in the src/modules/AddOnProduct.rb file, maybe it needs an update as
well...
}.freeze
# This maps uses a list of installed products as the key and the removed
products as a value.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.5.1/src/modules/AddOnProduct.rb
new/yast2-packager-4.5.2/src/modules/AddOnProduct.rb
--- old/yast2-packager-4.5.1/src/modules/AddOnProduct.rb 2022-04-07
13:42:53.000000000 +0200
+++ new/yast2-packager-4.5.2/src/modules/AddOnProduct.rb 2022-04-28
09:45:08.000000000 +0200
@@ -41,8 +41,13 @@
"sle-sdk" => ["sle-module-development-tools"],
# openSUSE => SLES migration
"openSUSE" => ["SLES"],
+ # openSUSE 15.3+ => SLES migration
+ "Leap" => ["SLES"],
# the IBM tools have been renamed in SLE12->SLE15 upgrade
"ibm-dlpar-utils" => ["ibm-power-tools"]
+
+ # NOTE: if you change anything here then check the MAPPING value
+ # in the src/lib/y2packager/product_upgrade.rb file, maybe it needs an
update as well...
}.freeze
# @return [Hash] Product renames added externally through the #add_rename
method
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.5.1/test/lib/product_spec_reader_test.rb
new/yast2-packager-4.5.2/test/lib/product_spec_reader_test.rb
--- old/yast2-packager-4.5.1/test/lib/product_spec_reader_test.rb
2022-04-07 13:42:53.000000000 +0200
+++ new/yast2-packager-4.5.2/test/lib/product_spec_reader_test.rb
2022-04-28 09:45:08.000000000 +0200
@@ -38,6 +38,9 @@
let(:full_products) { [instance_double(Y2Packager::ProductSpec, name:
"SLES")] }
let(:control_products) { [instance_double(Y2Packager::ProductSpec, name:
"SLED")] }
let(:libzypp_products) { [instance_double(Y2Packager::ProductSpec, name:
"SLE-HA")] }
+ let(:linuxrc_fake) { { foo: "bar" } }
+ let(:linuxrc_empty) { {} }
+ let(:linuxrc_keys) { linuxrc_fake }
describe "#products" do
before do
@@ -47,6 +50,7 @@
allow(Y2Packager::InstallationMedium).to
receive(:contain_repo?).and_return(false)
allow(Y2Packager::InstallationMedium).to
receive(:contain_multi_repos?).and_return(false)
allow(Yast::Mode).to receive(:normal).and_return(false)
+ allow(Yast::Linuxrc).to receive(:keys).and_return(linuxrc_keys)
end
context "when medium does not contain any repository" do
@@ -82,6 +86,17 @@
end
it "returns the libzypp products" do
+ expect(reader.products).to eq(libzypp_products)
+ end
+ end
+
+ context "without /etc/install.inf" do
+ let(:linuxrc_keys) { linuxrc_empty }
+ before do
+ allow(Yast::Mode).to receive(:normal).and_return(false)
+ end
+
+ it "returns the libzypp products" do
expect(reader.products).to eq(libzypp_products)
end
end
