Hello community, here is the log from the commit of package yast2-update for openSUSE:Leap:15.2 checked in at 2020-02-04 17:54:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/yast2-update (Old) and /work/SRC/openSUSE:Leap:15.2/.yast2-update.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Tue Feb 4 17:54:30 2020 rev:72 rq:768919 version:4.2.14 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/yast2-update/yast2-update.changes 2020-01-17 11:58:45.516433211 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.yast2-update.new.26092/yast2-update.changes 2020-02-04 17:54:50.264764421 +0100 @@ -1,0 +2,8 @@ +Tue Jan 28 10:23:51 UTC 2020 - Ladislav Slezák <[email protected]> + +- Store the original repository setup early in the upgrade workflow + so YaST can easily differ between the old and new repositories + (bsc#1159433) +- 4.2.14 + +------------------------------------------------------------------- Old: ---- yast2-update-4.2.13.tar.bz2 New: ---- yast2-update-4.2.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.sStHIa/_old 2020-02-04 17:54:50.708764689 +0100 +++ /var/tmp/diff_new_pack.sStHIa/_new 2020-02-04 17:54:50.708764689 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.13 +Version: 4.2.14 Release: 0 Summary: YaST2 - Update License: GPL-2.0-only @@ -29,8 +29,8 @@ BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: yast2-ruby-bindings >= 1.0.0 -# Y2Packager::ProductUpgrade.remove_obsolete_upgrades -BuildRequires: yast2 >= 4.2.1 +# Y2Packager::OriginalRepositorySetup +BuildRequires: yast2 >= 4.2.60 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 # xmllint @@ -44,8 +44,8 @@ # Y2Storage::Crypttab.save_encryption_names Requires: yast2-storage-ng >= 4.2.42 -# Y2Packager::ProductUpgrade.remove_obsolete_upgrades -Requires: yast2 >= 4.2.1 +# Y2Packager::OriginalRepositorySetup +Requires: yast2 >= 4.2.60 Requires: yast2-installation # product_update_summary, product_update_warning Requires: yast2-packager >= 4.2.33 ++++++ yast2-update-4.2.13.tar.bz2 -> yast2-update-4.2.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/package/yast2-update.changes new/yast2-update-4.2.14/package/yast2-update.changes --- old/yast2-update-4.2.13/package/yast2-update.changes 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.14/package/yast2-update.changes 2020-01-28 18:19:35.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jan 28 10:23:51 UTC 2020 - Ladislav Slezák <[email protected]> + +- Store the original repository setup early in the upgrade workflow + so YaST can easily differ between the old and new repositories + (bsc#1159433) +- 4.2.14 + +------------------------------------------------------------------- Fri Jan 3 14:51:57 CET 2020 - [email protected] - Aborting upgrade: Restoring old settings e.g. RPM database diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/package/yast2-update.spec new/yast2-update-4.2.14/package/yast2-update.spec --- old/yast2-update-4.2.13/package/yast2-update.spec 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.14/package/yast2-update.spec 2020-01-28 18:19:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.13 +Version: 4.2.14 Release: 0 Summary: YaST2 - Update Group: System/YaST @@ -29,8 +29,8 @@ BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: yast2-ruby-bindings >= 1.0.0 -# Y2Packager::ProductUpgrade.remove_obsolete_upgrades -BuildRequires: yast2 >= 4.2.1 +# Y2Packager::OriginalRepositorySetup +BuildRequires: yast2 >= 4.2.60 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 # xmllint @@ -44,8 +44,8 @@ # Y2Storage::Crypttab.save_encryption_names Requires: yast2-storage-ng >= 4.2.42 -# Y2Packager::ProductUpgrade.remove_obsolete_upgrades -Requires: yast2 >= 4.2.1 +# Y2Packager::OriginalRepositorySetup +Requires: yast2 >= 4.2.60 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.13/src/include/update/rootpart.rb new/yast2-update-4.2.14/src/include/update/rootpart.rb --- old/yast2-update-4.2.13/src/include/update/rootpart.rb 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.14/src/include/update/rootpart.rb 2020-01-28 18:19:35.000000000 +0100 @@ -30,6 +30,7 @@ require "y2packager/medium_type" require "y2packager/product_control_product" +require "y2packager/original_repository_setup" module Yast module UpdateRootpartInclude @@ -505,6 +506,15 @@ end end end + + if ret != :back + # force reloading the repositories + Yast::Pkg.SourceFinishAll + Yast::Pkg.SourceRestore + + # remember the original repositories + Y2Packager::OriginalRepositorySetup.instance.read + end end Convert.to_symbol(ret)
