Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2016-02-07 09:21:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2015-10-22 12:56:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2016-02-07 09:21:24.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 29 09:37:57 UTC 2016 - [email protected] + +- Fixed selecting additional products during system upgrade + (do not select previously unselected products after adding + repositories from the registration server) (bsc#959155) +- 3.1.35 + +------------------------------------------------------------------- Old: ---- yast2-update-3.1.34.tar.bz2 New: ---- yast2-update-3.1.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.4gwx7x/_old 2016-02-07 09:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.4gwx7x/_new 2016-02-07 09:21:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-update # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.34 +Version: 3.1.35 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-update-3.1.34.tar.bz2 -> yast2-update-3.1.35.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.34/package/yast2-update.changes new/yast2-update-3.1.35/package/yast2-update.changes --- old/yast2-update-3.1.34/package/yast2-update.changes 2015-10-05 09:22:14.000000000 +0200 +++ new/yast2-update-3.1.35/package/yast2-update.changes 2016-02-02 09:27:11.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 29 09:37:57 UTC 2016 - [email protected] + +- Fixed selecting additional products during system upgrade + (do not select previously unselected products after adding + repositories from the registration server) (bsc#959155) +- 3.1.35 + +------------------------------------------------------------------- Mon Oct 5 08:49:01 CEST 2015 - [email protected] - Added new test for Update.IsProductSupportedForUpgrade diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.34/package/yast2-update.spec new/yast2-update-3.1.35/package/yast2-update.spec --- old/yast2-update-3.1.34/package/yast2-update.spec 2015-10-05 09:22:14.000000000 +0200 +++ new/yast2-update-3.1.35/package/yast2-update.spec 2016-02-02 09:27:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.34 +Version: 3.1.35 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.34/src/clients/update_proposal.rb new/yast2-update-3.1.35/src/clients/update_proposal.rb --- old/yast2-update-3.1.34/src/clients/update_proposal.rb 2015-10-05 09:22:14.000000000 +0200 +++ new/yast2-update-3.1.35/src/clients/update_proposal.rb 2016-02-02 09:27:11.000000000 +0100 @@ -474,10 +474,16 @@ if !Update.did_init1 Update.did_init1 = true + # products to reselect after reset restore = [] - selected = Pkg.ResolvableProperties("", :product, "") - Builtins.foreach(selected) do |s| - restore = Builtins.add(restore, Ops.get_string(s, "name", "")) + + Pkg.ResolvableProperties("", :product, "").each do |product| + # only selected items but ignore the selections done by solver, + # during restoration they would be changed to be selected by YaST and they + # will be selected by solver again anyway + if product["status"] == :selected && product["transact_by"] != :solver + restore << product["name"] + end end Pkg.PkgApplReset @@ -522,6 +528,11 @@ Update.solve_errors = Pkg.PkgSolveErrors end + log.info "Update compatibility: " \ + "Update.ProductsCompatible: #{Update.ProductsCompatible}, " \ + "Update.products_incompatible: #{Update.products_incompatible}, " \ + "update_not_possible: #{update_not_possible}" + # check product compatibility if !(Update.ProductsCompatible || Update.products_incompatible) || update_not_possible if Popup.ContinueCancel( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.34/src/modules/Update.rb new/yast2-update-3.1.35/src/modules/Update.rb --- old/yast2-update-3.1.34/src/modules/Update.rb 2015-10-05 09:22:14.000000000 +0200 +++ new/yast2-update-3.1.35/src/modules/Update.rb 2016-02-02 09:27:12.000000000 +0100 @@ -122,23 +122,20 @@ #----------------------------------------------------------------------- def ListOfRegexpsMatchesProduct(regexp_items, product) - regexp_items = deep_copy(regexp_items) - return false if regexp_items == nil || regexp_items == [] - if product == nil - Builtins.y2error("Product is nil") + return false if regexp_items.nil? || regexp_items.empty? + + if product.nil? + log.error "Product is nil" return false end - ret = false - Builtins.foreach(regexp_items) do |one_regexp| - if Builtins.regexpmatch(product, one_regexp) - Builtins.y2milestone(">%1< is matching >%2<", product, one_regexp) - ret = true - raise Break - end + ret = regexp_items.any? do |one_regexp| + match = Builtins.regexpmatch(product, one_regexp) + log.info ">#{product}< is matching >#{one_regexp}<" if match + match end - Builtins.y2milestone("Returning %1", ret) + log.info "A regexp matches the installed product: #{ret}" ret end
