Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2019-03-13 09:09:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Wed Mar 13 09:09:29 2019 rev:447 rq:684405 version:4.1.62 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2019-03-10 09:30:18.772251224 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new.28833/yast2.changes 2019-03-13 09:09:30.499422172 +0100 @@ -1,0 +2,8 @@ +Tue Mar 12 08:38:32 UTC 2019 - [email protected] + +- Fixed product filtering in product_reader.rb, fixes problem + when upgrading SLE15-SP1 to SLE15-SP1 (usually used to fix + a broken system) (bsc#1128459) +- 4.1.62 + +------------------------------------------------------------------- Old: ---- yast2-4.1.61.tar.bz2 New: ---- yast2-4.1.62.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.w2Zbss/_old 2019-03-13 09:09:33.099421904 +0100 +++ /var/tmp/diff_new_pack.w2Zbss/_new 2019-03-13 09:09:33.103421903 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.1.61 +Version: 4.1.62 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0-only ++++++ yast2-4.1.61.tar.bz2 -> yast2-4.1.62.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.61/library/packages/src/lib/y2packager/product_reader.rb new/yast2-4.1.62/library/packages/src/lib/y2packager/product_reader.rb --- old/yast2-4.1.61/library/packages/src/lib/y2packager/product_reader.rb 2019-03-08 12:14:26.000000000 +0100 +++ new/yast2-4.1.62/library/packages/src/lib/y2packager/product_reader.rb 2019-03-12 16:59:48.000000000 +0100 @@ -148,8 +148,9 @@ # remove duplicates, there migth be different flavors ("DVD"/"POOL") # or archs (x86_64/i586), when selecting the product to install later - # libzypp will select the correct arch automatically - products.uniq! { |p| "#{p["name"]}__#{p["version"]}" } + # libzypp will select the correct arch automatically, + # keep products with different state, they are filtered out later + products.uniq! { |p| "#{p["name"]}__#{p["version"]}__#{p["status"]}" } log.info "Found products: #{products.map { |p| p["name"] }}" products diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.61/library/packages/test/y2packager/product_reader_test.rb new/yast2-4.1.62/library/packages/test/y2packager/product_reader_test.rb --- old/yast2-4.1.61/library/packages/test/y2packager/product_reader_test.rb 2019-03-08 12:14:26.000000000 +0100 +++ new/yast2-4.1.62/library/packages/test/y2packager/product_reader_test.rb 2019-03-12 16:59:48.000000000 +0100 @@ -126,10 +126,10 @@ allow(subject).to receive(:product_package).with("SLES_BCL-release") .and_return("deps" => [{ "conflicts"=>"kernel < 4.4" }, { "provides"=>"specialproduct(SLES_BCL)" }]) + allow(Yast::Linuxrc).to receive(:InstallInf).with("specialproduct").and_return(nil) end it "returns available products without special products" do - allow(Yast::Linuxrc).to receive(:InstallInf).with("specialproduct").and_return(nil) expect(subject.all_products.size).to eq(1) end @@ -137,5 +137,18 @@ allow(Yast::Linuxrc).to receive(:InstallInf).with("specialproduct").and_return("SLES_BCL") expect(subject.all_products.size).to eq(2) end + + it "returns the available product also when an installed product is found" do + installed = products.first.dup + installed["status"] = :installed + available = products.first.dup + available["status"] = :available + + # return the installed product first to ensure the following available duplicate is not lost + allow(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([installed, available]) + + expect(subject.all_products).to_not be_empty + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.61/package/yast2.changes new/yast2-4.1.62/package/yast2.changes --- old/yast2-4.1.61/package/yast2.changes 2019-03-08 12:14:26.000000000 +0100 +++ new/yast2-4.1.62/package/yast2.changes 2019-03-12 16:59:48.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Mar 12 08:38:32 UTC 2019 - [email protected] + +- Fixed product filtering in product_reader.rb, fixes problem + when upgrading SLE15-SP1 to SLE15-SP1 (usually used to fix + a broken system) (bsc#1128459) +- 4.1.62 + +------------------------------------------------------------------- Fri Mar 8 08:15:47 UTC 2019 - Michal Filka <[email protected]> - bnc#1127798 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.61/package/yast2.spec new/yast2-4.1.62/package/yast2.spec --- old/yast2-4.1.61/package/yast2.spec 2019-03-08 12:14:26.000000000 +0100 +++ new/yast2-4.1.62/package/yast2.spec 2019-03-12 16:59:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.1.61 +Version: 4.1.62 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0-only
