Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2019-12-14 12:02:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Sat Dec 14 12:02:41 2019 rev:134 rq:754097 version:4.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2019-11-20 10:25:43.174544136 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-update.new.4691/yast2-update.changes 2019-12-14 12:03:05.887406153 +0100 @@ -1,0 +2,14 @@ +Wed Dec 4 14:29:12 UTC 2019 - Josef Reidinger <[email protected]> + +- fix upgrade for online medium (bsc#1158056 and bsc#1157636) +- 4.2.12 + +------------------------------------------------------------------- +Tue Nov 19 10:59:04 CET 2019 - [email protected] + +- Using Y2Packager::Resolvable.any? and Y2Packager::Resolvable.find + in order to decrease the required memory (bsc#1132650, + bsc#1140037). +- 4.2.11 + +------------------------------------------------------------------- Old: ---- yast2-update-4.2.10.tar.bz2 New: ---- yast2-update-4.2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.KC6qqh/_old 2019-12-14 12:03:06.679406035 +0100 +++ /var/tmp/diff_new_pack.KC6qqh/_new 2019-12-14 12:03:06.691406033 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.10 +Version: 4.2.12 Release: 0 Summary: YaST2 - Update License: GPL-2.0-only @@ -47,8 +47,8 @@ # Y2Packager::ProductUpgrade.remove_obsolete_upgrades Requires: yast2 >= 4.2.1 Requires: yast2-installation -# handle bind mount at /mnt/dev -Requires: yast2-packager >= 4.0.61 +# product_update_summary, product_update_warning +Requires: yast2-packager >= 4.2.33 # Pkg.TargetInitializeOptions() Requires: yast2-pkg-bindings >= 3.1.14 Requires: yast2-ruby-bindings >= 1.0.0 ++++++ yast2-update-4.2.10.tar.bz2 -> yast2-update-4.2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.10/package/yast2-update.changes new/yast2-update-4.2.12/package/yast2-update.changes --- old/yast2-update-4.2.10/package/yast2-update.changes 2019-11-07 15:20:50.000000000 +0100 +++ new/yast2-update-4.2.12/package/yast2-update.changes 2019-12-04 16:52:39.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Dec 4 14:29:12 UTC 2019 - Josef Reidinger <[email protected]> + +- fix upgrade for online medium (bsc#1158056 and bsc#1157636) +- 4.2.12 + +------------------------------------------------------------------- +Tue Nov 19 10:59:04 CET 2019 - [email protected] + +- Using Y2Packager::Resolvable.any? and Y2Packager::Resolvable.find + in order to decrease the required memory (bsc#1132650, + bsc#1140037). +- 4.2.11 + +------------------------------------------------------------------- Thu Nov 7 14:13:39 UTC 2019 - Ladislav Slezák <[email protected]> - Fixed too eager Rubocop cleanup resulting in "No fstab found" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.10/package/yast2-update.spec new/yast2-update-4.2.12/package/yast2-update.spec --- old/yast2-update-4.2.10/package/yast2-update.spec 2019-11-07 15:20:50.000000000 +0100 +++ new/yast2-update-4.2.12/package/yast2-update.spec 2019-12-04 16:52:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.10 +Version: 4.2.12 Release: 0 Summary: YaST2 - Update Group: System/YaST @@ -47,8 +47,8 @@ # Y2Packager::ProductUpgrade.remove_obsolete_upgrades Requires: yast2 >= 4.2.1 Requires: yast2-installation -# handle bind mount at /mnt/dev -Requires: yast2-packager >= 4.0.61 +# product_update_summary, product_update_warning +Requires: yast2-packager >= 4.2.33 # Pkg.TargetInitializeOptions() Requires: yast2-pkg-bindings >= 3.1.14 Requires: yast2-ruby-bindings >= 1.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.10/src/clients/packages_proposal.rb new/yast2-update-4.2.12/src/clients/packages_proposal.rb --- old/yast2-update-4.2.10/src/clients/packages_proposal.rb 2019-11-07 15:20:50.000000000 +0100 +++ new/yast2-update-4.2.12/src/clients/packages_proposal.rb 2019-12-04 16:52:39.000000000 +0100 @@ -24,6 +24,9 @@ # Purpose: Let user choose packages during update. # # $Id$ + +require "y2packager/resolvable" + module Yast unless defined?(PackagesProposalClient) class PackagesProposalClient < Client @@ -177,7 +180,7 @@ Builtins.y2milestone( "Products: %1", - Pkg.ResolvableProperties("", :product, "") + Y2Packager::Resolvable.find(kind: :product) ) ret_ref = arg_ref(@ret) Packages.CheckOldAddOns(ret_ref) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.10/src/clients/update_proposal.rb new/yast2-update-4.2.12/src/clients/update_proposal.rb --- old/yast2-update-4.2.10/src/clients/update_proposal.rb 2019-11-07 15:20:50.000000000 +0100 +++ new/yast2-update-4.2.12/src/clients/update_proposal.rb 2019-12-04 16:52:39.000000000 +0100 @@ -26,6 +26,7 @@ require "cgi/util" require "y2packager/product_upgrade" +require "y2packager/resolvable" module Yast class UpdateProposalClient < Client @@ -184,7 +185,7 @@ ) end - products = Pkg.ResolvableProperties("", :product, "") + products = Y2Packager::Resolvable.find(kind: :product) # stores the proposal text output @summary_text = Packages.product_update_summary(products) .map { |item| "<li>#{item}</li>" }.join @@ -423,13 +424,11 @@ # products to reselect after reset restore = [] - Pkg.ResolvableProperties("", :product, "").each do |product| + Y2Packager::Resolvable.find(kind: :product, status: :selected).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 + restore << product.name if product.transact_by != :solver end Pkg.PkgApplReset diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.10/src/include/update/rootpart.rb new/yast2-update-4.2.12/src/include/update/rootpart.rb --- old/yast2-update-4.2.10/src/include/update/rootpart.rb 2019-11-07 15:20:50.000000000 +0100 +++ new/yast2-update-4.2.12/src/include/update/rootpart.rb 2019-12-04 16:52:39.000000000 +0100 @@ -512,7 +512,7 @@ def target_distribution # FIXME: this is the same as in src/lib/update/clients/inst_update_partition_auto.rb:113 - if Y2Packager::MediumType.offline? + if Y2Packager::MediumType.offline? || Y2Packager::MediumType.online? control_products = Y2Packager::ProductControlProduct.products # currently all products have the same "register_target" value return control_products.first&.register_target || "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.10/src/modules/Update.rb new/yast2-update-4.2.12/src/modules/Update.rb --- old/yast2-update-4.2.10/src/modules/Update.rb 2019-11-07 15:20:50.000000000 +0100 +++ new/yast2-update-4.2.12/src/modules/Update.rb 2019-12-04 16:52:39.000000000 +0100 @@ -28,6 +28,7 @@ require "yast" require "fileutils" +require "y2packager/resolvable" module Yast class UpdateClass < Module @@ -222,24 +223,14 @@ #----------------------------------------------------------------------- def SelectedProducts - selected = Pkg.ResolvableProperties("", :product, "") - selected = Builtins.filter(selected) do |p| - Ops.get(p, "status") == :selected - end - Builtins.maplist(selected) do |p| - Ops.get_locale( - p, - "display_name", - Ops.get_locale( - p, - "summary", - Ops.get_locale( - p, - "name", - Ops.get_locale(p, "version", _("Unknown Product")) - ) - ) - ) + selected = Y2Packager::Resolvable.find(kind: :product, status: :selected) + + selected.map do |product| + next product.display_name unless product.display_name.empty? + next product.summary unless product.summary.empty? + next product.name unless product.name.empty? + + _("Unknown Product") end end @@ -252,11 +243,7 @@ # media is same as one of the installed products # assuming that multiple products on installation media # are compatible and compatibility is transitive - inst = Pkg.ResolvableProperties("", :product, "") - inst = Builtins.filter(inst) { |p| Ops.get(p, "status") == :installed } - inst_names = Builtins.maplist(inst) do |p| - Ops.get_string(p, "name", "") - end + inst_names = Y2Packager::Resolvable.find(kind: :product, status: :installed).map(&:name) to_install = Builtins.maplist(Pkg.SourceGetCurrent(true)) do |src| prod_info = Pkg.SourceProductData(src) Ops.get_string(prod_info, "name", "") @@ -656,10 +643,10 @@ def GetBasePatterns # get available base patterns - patterns = Pkg.ResolvableProperties("", :pattern, "") + patterns = Y2Packager::Resolvable.find(kind: :pattern) patterns = Builtins.filter(patterns) do |p| - if Ops.get(p, "status") != :selected && - Ops.get(p, "status") != :available + if p.status != :selected && + p.status != :available next false end
