Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2019-04-12 09:12:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.27019 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Fri Apr 12 09:12:40 2019 rev:451 rq:693253 version:4.1.68 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2019-04-01 12:34:37.657817496 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.27019/yast2.changes 2019-04-12 09:12:46.605623203 +0200 @@ -1,0 +2,13 @@ +Tue Apr 9 09:50:45 UTC 2019 - [email protected] +- Updated map for evaluating upgraded products + (e.g. for SUSE-Manager). (bsc#1131503) +- Upgrade: Evaluating product obsoletes in order to show it in + the proposal overview. +- 4.1.68 + +------------------------------------------------------------------- +Tue Apr 9 08:03:00 UTC 2019 - Jan Engelhardt <[email protected]> + +- Use noun phrase in summary. + +------------------------------------------------------------------- Old: ---- yast2-4.1.67.tar.bz2 New: ---- yast2-4.1.68.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.7pYQLG/_old 2019-04-12 09:12:48.121623853 +0200 +++ /var/tmp/diff_new_pack.7pYQLG/_new 2019-04-12 09:12:48.125623855 +0200 @@ -17,9 +17,9 @@ Name: yast2 -Version: 4.1.67 +Version: 4.1.68 Release: 0 -Summary: YaST2 - Main Package +Summary: YaST2 Main Package License: GPL-2.0-only Group: System/YaST Url: https://github.com/yast/yast-yast2 @@ -213,8 +213,7 @@ %{yast_icondir} %package logs - -Summary: Collecting YAST information +Summary: Scripts for handling YAST logs Group: System/YaST Provides: yast2:/usr/sbin/save_y2logs ++++++ yast2-4.1.67.tar.bz2 -> yast2-4.1.68.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.67/Dockerfile new/yast2-4.1.68/Dockerfile --- old/yast2-4.1.67/Dockerfile 2019-03-29 12:02:36.000000000 +0100 +++ new/yast2-4.1.68/Dockerfile 2019-04-11 14:56:26.000000000 +0200 @@ -1,7 +1,7 @@ # Use this base image -# - built: https://hub.docker.com/r/yastdevel/ruby/ -# - source: https://github.com/yast/docker-yast-ruby -FROM yastdevel/ruby +# - built: https://registry.opensuse.org +# - source: https://github.com/yast/ci-ruby-container +FROM registry.opensuse.org/yast/head/containers/yast-ruby COPY . /usr/src/app # English messages, UTF-8, "C" locale for numeric formatting tests ENV LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.67/library/packages/src/lib/y2packager/product_upgrade.rb new/yast2-4.1.68/library/packages/src/lib/y2packager/product_upgrade.rb --- old/yast2-4.1.67/library/packages/src/lib/y2packager/product_upgrade.rb 2019-03-29 12:02:36.000000000 +0100 +++ new/yast2-4.1.68/library/packages/src/lib/y2packager/product_upgrade.rb 2019-04-11 14:56:26.000000000 +0200 @@ -25,20 +25,23 @@ MAPPING = { # SLES12 + HPC module => SLESHPC15 # (a bit tricky, the module became a new base product!) - ["SLES", "sle-module-hpc"] => "SLE_HPC", + ["SLES", "sle-module-hpc"] => "SLE_HPC", + ["SLES", "SUSE-Manager-Proxy"] => "SUSE-Manager-Proxy", + ["SLES", "SUSE-Manager-Server"] => "SUSE-Manager-Server", + ["SLES", "SUSE-Manager-Proxy", "SUSE-Manager-Retail-Branch-Server"] => "SUSE-Manager-Retail-Branch-Server", # this is an internal product so far... - ["SLE-HPC"] => "SLE_HPC", + ["SLE-HPC"] => "SLE_HPC", # SLES11 => SLES15 - ["SUSE_SLES"] => "SLES", + ["SUSE_SLES"] => "SLES", # SLED11 => SLED15 - ["SUSE_SLED"] => "SLED", + ["SUSE_SLED"] => "SLED", # SLES4SAP11 => SLES4SAP15 - ["SUSE_SLES_SAP"] => "SLES_SAP", + ["SUSE_SLES_SAP"] => "SLES_SAP", # (installed) openSUSE => (available) SLES, # this one is used when openSUSE is not available, e.g. booting SLE medium # (moreover the openSUSE medium should contain only one product so that # product should be used unconditionally) - ["openSUSE"] => "SLES" + ["openSUSE"] => "SLES" }.freeze class << self @@ -86,6 +89,18 @@ find_by_name(available) end + # Returns the product name which obsoletes the given product. + # @param old_product_name <String> Product name which will be obsoleted + # @return [<String>] Product names which obsoletes this product. + def will_be_obsoleted_by(old_product_name) + installed = Y2Packager::Product.installed_products.map(&:name) + MAPPING.each_with_object([]) do |(products, obsoleted_by), a| + if products.include?(old_product_name) && (products - installed).empty? + a << obsoleted_by + end + end + end + private # check the count of the new base products diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.67/library/packages/test/y2packager/product_upgrade_test.rb new/yast2-4.1.68/library/packages/test/y2packager/product_upgrade_test.rb --- old/yast2-4.1.67/library/packages/test/y2packager/product_upgrade_test.rb 2019-03-29 12:02:36.000000000 +0100 +++ new/yast2-4.1.68/library/packages/test/y2packager/product_upgrade_test.rb 2019-04-11 14:56:26.000000000 +0200 @@ -9,6 +9,10 @@ let(:product1) { Y2Packager::Product.new(name: "testing_product1") } let(:product2) { Y2Packager::Product.new(name: "testing_product2") } let(:product3) { Y2Packager::Product.new(name: "testing_product3") } + let(:sles) { Y2Packager::Product.new(name: "SLES") } + let(:sles_hpc) { Y2Packager::Product.new(name: "SLE_HPC") } + let(:hpc_module) { Y2Packager::Product.new(name: "sle-module-hpc") } + let(:sles11) { Y2Packager::Product.new(name: "SUSE_SLES") } describe ".new_base_product" do context "no base product is available" do @@ -33,11 +37,6 @@ end context "several base products are available" do - let(:sles) { Y2Packager::Product.new(name: "SLES") } - let(:sles_hpc) { Y2Packager::Product.new(name: "SLE_HPC") } - let(:hpc_module) { Y2Packager::Product.new(name: "sle-module-hpc") } - let(:sles11) { Y2Packager::Product.new(name: "SUSE_SLES") } - before do expect(Y2Packager::Product).to receive(:available_base_products) .and_return([product1, product2, sles, sles_hpc]).at_least(:once) @@ -71,4 +70,30 @@ end end end + + describe ".will_be_obsoleted_by" do + context "given product is not installed" do + it "returns an empty array" do + expect(Y2Packager::Product).to receive(:installed_products) + .and_return([sles, hpc_module]) + expect(described_class.will_be_obsoleted_by("not_there")).to be_empty + end + end + + context "given product is installed but not required module" do + it "returns an empty array" do + expect(Y2Packager::Product).to receive(:installed_products) + .and_return([sles, sles_hpc]) + expect(described_class.will_be_obsoleted_by("SLES")).to be_empty + end + end + + context "given product and the required module is installed" do + it "returns the product which obsoletes the old one" do + expect(Y2Packager::Product).to receive(:installed_products) + .and_return([sles, hpc_module]) + expect(described_class.will_be_obsoleted_by("SLES")).to contain_exactly("SLE_HPC") + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.67/package/yast2.changes new/yast2-4.1.68/package/yast2.changes --- old/yast2-4.1.67/package/yast2.changes 2019-03-29 12:02:36.000000000 +0100 +++ new/yast2-4.1.68/package/yast2.changes 2019-04-11 14:56:26.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Apr 9 09:50:45 UTC 2019 - [email protected] +- Updated map for evaluating upgraded products + (e.g. for SUSE-Manager). (bsc#1131503) +- Upgrade: Evaluating product obsoletes in order to show it in + the proposal overview. +- 4.1.68 + +------------------------------------------------------------------- +Tue Apr 9 08:03:00 UTC 2019 - Jan Engelhardt <[email protected]> + +- Use noun phrase in summary. + +------------------------------------------------------------------- Tue Mar 26 22:46:58 UTC 2019 - [email protected] - Firewall: Zone name has been removed from the common attributes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.67/package/yast2.spec new/yast2-4.1.68/package/yast2.spec --- old/yast2-4.1.67/package/yast2.spec 2019-03-29 12:02:36.000000000 +0100 +++ new/yast2-4.1.68/package/yast2.spec 2019-04-11 14:56:26.000000000 +0200 @@ -17,9 +17,9 @@ Name: yast2 -Version: 4.1.67 +Version: 4.1.68 Release: 0 -Summary: YaST2 - Main Package +Summary: YaST2 Main Package License: GPL-2.0-only Group: System/YaST Url: https://github.com/yast/yast-yast2 @@ -213,8 +213,7 @@ %{yast_icondir} %package logs - -Summary: Collecting YAST information +Summary: Scripts for handling YAST logs Group: System/YaST Provides: yast2:/usr/sbin/save_y2logs
