Hello community, here is the log from the commit of package yast2-update for openSUSE:Leap:15.2 checked in at 2020-03-13 10:55:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/yast2-update (Old) and /work/SRC/openSUSE:Leap:15.2/.yast2-update.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Fri Mar 13 10:55:57 2020 rev:75 rq:784368 version:4.2.18 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/yast2-update/yast2-update.changes 2020-02-27 06:41:41.945634069 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.yast2-update.new.3160/yast2-update.changes 2020-03-13 10:55:58.556374820 +0100 @@ -1,0 +2,7 @@ +Thu Mar 12 08:52:36 UTC 2020 - Ladislav Slezák <[email protected]> + +- Do not remove the installation repositories in the "Previously + Used Repositories" step (bsc#1163081) +- 4.2.18 + +------------------------------------------------------------------- Old: ---- yast2-update-4.2.17.tar.bz2 New: ---- yast2-update-4.2.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.FfFexH/_old 2020-03-13 10:55:58.864375040 +0100 +++ /var/tmp/diff_new_pack.FfFexH/_new 2020-03-13 10:55:58.868375042 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.17 +Version: 4.2.18 Release: 0 Summary: YaST2 - Update License: GPL-2.0-only @@ -30,7 +30,7 @@ BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: yast2-ruby-bindings >= 1.0.0 # Y2Packager::OriginalRepositorySetup -BuildRequires: yast2 >= 4.2.60 +BuildRequires: yast2 >= 4.2.71 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 # xmllint @@ -46,7 +46,7 @@ # Y2Storage::Crypttab.save_encryption_names Requires: yast2-storage-ng >= 4.2.42 # Y2Packager::OriginalRepositorySetup -Requires: yast2 >= 4.2.60 +Requires: yast2 >= 4.2.71 Requires: yast2-installation # product_update_summary, product_update_warning Requires: yast2-packager >= 4.2.33 ++++++ yast2-update-4.2.17.tar.bz2 -> yast2-update-4.2.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.17/package/yast2-update.changes new/yast2-update-4.2.18/package/yast2-update.changes --- old/yast2-update-4.2.17/package/yast2-update.changes 2020-02-21 12:45:05.000000000 +0100 +++ new/yast2-update-4.2.18/package/yast2-update.changes 2020-03-12 10:48:31.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 12 08:52:36 UTC 2020 - Ladislav Slezák <[email protected]> + +- Do not remove the installation repositories in the "Previously + Used Repositories" step (bsc#1163081) +- 4.2.18 + +------------------------------------------------------------------- Fri Feb 21 09:06:01 UTC 2020 - Ladislav Slezák <[email protected]> - Fixed repository loading to not remove the initial installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.17/package/yast2-update.spec new/yast2-update-4.2.18/package/yast2-update.spec --- old/yast2-update-4.2.17/package/yast2-update.spec 2020-02-21 12:45:05.000000000 +0100 +++ new/yast2-update-4.2.18/package/yast2-update.spec 2020-03-12 10:48:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.17 +Version: 4.2.18 Release: 0 Summary: YaST2 - Update Group: System/YaST @@ -30,7 +30,7 @@ BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: yast2-ruby-bindings >= 1.0.0 # Y2Packager::OriginalRepositorySetup -BuildRequires: yast2 >= 4.2.60 +BuildRequires: yast2 >= 4.2.71 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 # xmllint @@ -46,7 +46,7 @@ # Y2Storage::Crypttab.save_encryption_names Requires: yast2-storage-ng >= 4.2.42 # Y2Packager::OriginalRepositorySetup -Requires: yast2 >= 4.2.60 +Requires: yast2 >= 4.2.71 Requires: yast2-installation # product_update_summary, product_update_warning Requires: yast2-packager >= 4.2.33 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.17/src/include/update/rootpart.rb new/yast2-update-4.2.18/src/include/update/rootpart.rb --- old/yast2-update-4.2.17/src/include/update/rootpart.rb 2020-02-21 12:45:05.000000000 +0100 +++ new/yast2-update-4.2.18/src/include/update/rootpart.rb 2020-03-12 10:48:31.000000000 +0100 @@ -29,8 +29,9 @@ require "yast" require "y2packager/medium_type" -require "y2packager/product_control_product" require "y2packager/original_repository_setup" +require "y2packager/product_control_product" +require "y2packager/repository" module Yast module UpdateRootpartInclude @@ -508,10 +509,12 @@ end if ret != :back + install_repos = Y2Packager::Repository.all + log.info "Installation repositories (#{install_repos.size}): #{install_repos.map(&:url)}" # load the repositories from the system Yast::Pkg.SourceRestore - # remember the original setup - Y2Packager::OriginalRepositorySetup.instance.read + # remember the original setup, ignore the installation repositories + Y2Packager::OriginalRepositorySetup.instance.read(install_repos) end end
