Hello community, here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2020-01-11 14:47:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old) and /work/SRC/openSUSE:Factory/.yast2-registration.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration" Sat Jan 11 14:47:38 2020 rev:45 rq:762882 version:4.2.24 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2019-12-14 12:05:22.843383176 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-registration.new.6675/yast2-registration.changes 2020-01-11 14:47:47.733368536 +0100 @@ -1,0 +2,8 @@ +Fri Jan 10 14:16:55 UTC 2020 - Ladislav Slezák <[email protected]> + +- Load the old repositories before running the migration + so the code can properly detect the old and the new repositories + and remove the obsoleted services from the system (bsc#1159433) +- 4.2.24 + +------------------------------------------------------------------- Old: ---- yast2-registration-4.2.23.tar.bz2 New: ---- yast2-registration-4.2.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.VV1PhN/_old 2020-01-11 14:47:48.805368954 +0100 +++ /var/tmp/diff_new_pack.VV1PhN/_new 2020-01-11 14:47:48.837368966 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-registration # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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-registration -Version: 4.2.23 +Version: 4.2.24 Release: 0 Summary: YaST2 - Registration Module License: GPL-2.0-only ++++++ yast2-registration-4.2.23.tar.bz2 -> yast2-registration-4.2.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.23/package/yast2-registration.changes new/yast2-registration-4.2.24/package/yast2-registration.changes --- old/yast2-registration-4.2.23/package/yast2-registration.changes 2019-12-13 18:56:16.000000000 +0100 +++ new/yast2-registration-4.2.24/package/yast2-registration.changes 2020-01-10 16:59:46.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 10 14:16:55 UTC 2020 - Ladislav Slezák <[email protected]> + +- Load the old repositories before running the migration + so the code can properly detect the old and the new repositories + and remove the obsoleted services from the system (bsc#1159433) +- 4.2.24 + +------------------------------------------------------------------- Fri Dec 6 13:12:59 UTC 2019 - Josef Reidinger <[email protected]> - Improve messages when auto upgrading unregistered system with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.23/package/yast2-registration.spec new/yast2-registration-4.2.24/package/yast2-registration.spec --- old/yast2-registration-4.2.23/package/yast2-registration.spec 2019-12-13 18:56:16.000000000 +0100 +++ new/yast2-registration-4.2.24/package/yast2-registration.spec 2020-01-10 16:59:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.2.23 +Version: 4.2.24 Release: 0 Summary: YaST2 - Registration Module License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.23/src/lib/registration/ui/offline_migration_workflow.rb new/yast2-registration-4.2.24/src/lib/registration/ui/offline_migration_workflow.rb --- old/yast2-registration-4.2.23/src/lib/registration/ui/offline_migration_workflow.rb 2019-12-13 18:56:16.000000000 +0100 +++ new/yast2-registration-4.2.24/src/lib/registration/ui/offline_migration_workflow.rb 2020-01-10 16:59:46.000000000 +0100 @@ -53,6 +53,8 @@ return :back end + reinit_repos + # run the main registration migration ui = migration_repos @@ -74,6 +76,13 @@ private + # force reloading of the old repositories so we can detect and remove the obsoleted + # services during migration (bsc#1159433) + def reinit_repos + Yast::Pkg.SourceFinishAll + Yast::Pkg.SourceRestore + end + def going_back log.info("Going back") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.23/test/offline_migration_workflow_test.rb new/yast2-registration-4.2.24/test/offline_migration_workflow_test.rb --- old/yast2-registration-4.2.23/test/offline_migration_workflow_test.rb 2019-12-13 18:56:16.000000000 +0100 +++ new/yast2-registration-4.2.24/test/offline_migration_workflow_test.rb 2020-01-10 16:59:46.000000000 +0100 @@ -13,6 +13,8 @@ allow(File).to receive(:exist?) allow(Yast::WFM).to receive(:CallFunction) allow(Yast::Stage).to receive(:initial).and_return(true) + allow(Yast::Pkg).to receive(:SourceFinishAll) + allow(Yast::Pkg).to receive(:SourceRestore) end shared_examples "certificate cleanup" do @@ -83,6 +85,13 @@ subject.main end + it "loads the libzypp repositories" do + expect(Yast::Pkg).to receive(:SourceFinishAll) + expect(Yast::Pkg).to receive(:SourceRestore) + + subject.main + end + it "returns the 'inst_migration_repos' result" do expect(Yast::WFM).to receive(:CallFunction).with("inst_migration_repos", anything) .and_return(:foo)
