Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2020-03-14 09:54:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Sat Mar 14 09:54:45 2020 rev:136 rq:784236 version:4.2.18 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2020-01-11 14:47:32.205362483 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-update.new.3160/yast2-update.changes 2020-03-14 09:54:48.499086702 +0100 @@ -1,0 +2,39 @@ +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 + repository (bsc#1163081) +- 4.2.17 + +------------------------------------------------------------------- +Wed Feb 19 14:43:22 UTC 2020 - Ladislav Slezák <[email protected]> + +- Switch from Autotools based build to Rake + +------------------------------------------------------------------- +Wed Feb 19 09:57:26 UTC 2020 - Stefan Hundhammer <[email protected]> + +- Fixed user-visible messages (bsc#1084015) +- 4.2.16 + +------------------------------------------------------------------- +Mon Feb 17 15:43:57 CET 2020 - [email protected] + +- Also accept Packages.db as valid rpm database (bsc#1162485) +- 4.2.15 + +------------------------------------------------------------------- +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.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.SrDqiZ/_old 2020-03-14 09:54:49.019087084 +0100 +++ /var/tmp/diff_new_pack.SrDqiZ/_new 2020-03-14 09:54:49.019087084 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.13 +Version: 4.2.18 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.71 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 # xmllint @@ -39,18 +39,19 @@ BuildRequires: yast2-installation-control # Needed for tests BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) # Y2Storage::Crypttab.save_encryption_names BuildRequires: yast2-storage-ng >= 4.2.42 # 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.71 Requires: yast2-installation # product_update_summary, product_update_warning Requires: yast2-packager >= 4.2.33 -# Pkg.TargetInitializeOptions() -Requires: yast2-pkg-bindings >= 3.1.14 +# Improved Pkg.SourceRestore() +Requires: yast2-pkg-bindings >= 4.2.6 Requires: yast2-ruby-bindings >= 1.0.0 # use parallel gzip when crating backup (much faster) Requires: pigz @@ -88,7 +89,9 @@ %setup -q %build -%yast_build + +%check +%yast_check %install %yast_install ++++++ yast2-update-4.2.13.tar.bz2 -> yast2-update-4.2.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/Makefile.cvs new/yast2-update-4.2.18/Makefile.cvs --- old/yast2-update-4.2.13/Makefile.cvs 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# -# Makefile.cvs -# - -LIB = $(shell y2tool get-lib) - -PREFIX = /usr - -configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) - -all: - y2tool y2autoconf - y2tool y2automake - autoreconf --force --install - -install: configure - make - make install - -reconf: all - ./config.status --recheck - ./config.status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/Rakefile new/yast2-update-4.2.18/Rakefile --- old/yast2-update-4.2.13/Rakefile 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/Rakefile 2020-03-12 10:48:31.000000000 +0100 @@ -1,6 +1,15 @@ require "yast/rake" +require "shellwords" Yast::Tasks.configuration do |conf| # lets ignore license check for now conf.skip_license_check << /.*/ + + conf.install_locations["control/*.xml"] = Packaging::Configuration::YAST_DIR + "/control/" +end + +# additionally validate the control XML files as a part of the unit tests +task "test:unit" do + sh "xmllint --noout --relaxng #{Packaging::Configuration::YAST_DIR.shellescape}"\ + "/control/control.rng control/*.xml" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/configure.in.in new/yast2-update-4.2.18/configure.in.in --- old/yast2-update-4.2.13/configure.in.in 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/configure.in.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -## YCP module configure.in.in - -## Initialize -@YAST2-INIT-COMMON@ -@YAST2-INIT-YCP@ - -## some common checks -@YAST2-CHECKS-COMMON@ -@YAST2-CHECKS-YCP@ - -## and generate the output... -@YAST2-OUTPUT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/control/Makefile.am new/yast2-update-4.2.18/control/Makefile.am --- old/yast2-update-4.2.13/control/Makefile.am 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/control/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -# -# Makefile.am for control -# - -dist_control_DATA = $(wildcard *.xml) - -check-local: - xmllint --relaxng $(controldir)/control.rng --noout $(dist_control_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/control/update.xml new/yast2-update-4.2.18/control/update.xml --- old/yast2-update-4.2.13/control/update.xml 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/control/update.xml 2020-03-12 10:48:31.000000000 +0100 @@ -68,7 +68,7 @@ </workflows> <inst_finish_stages config:type="list"> <inst_finish_stage> - <label>Update Configuration</label> + <label>Configure Online Update</label> <steps config:type="list"> <step>pkg</step> </steps> 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.18/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.18/package/yast2-update.changes 2020-03-12 10:48:31.000000000 +0100 @@ -1,4 +1,43 @@ ------------------------------------------------------------------- +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 + repository (bsc#1163081) +- 4.2.17 + +------------------------------------------------------------------- +Wed Feb 19 14:43:22 UTC 2020 - Ladislav Slezák <[email protected]> + +- Switch from Autotools based build to Rake + +------------------------------------------------------------------- +Wed Feb 19 09:57:26 UTC 2020 - Stefan Hundhammer <[email protected]> + +- Fixed user-visible messages (bsc#1084015) +- 4.2.16 + +------------------------------------------------------------------- +Mon Feb 17 15:43:57 CET 2020 - [email protected] + +- Also accept Packages.db as valid rpm database (bsc#1162485) +- 4.2.15 + +------------------------------------------------------------------- +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.18/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.18/package/yast2-update.spec 2020-03-12 10:48:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.2.13 +Version: 4.2.18 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.71 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 # xmllint @@ -39,18 +39,19 @@ BuildRequires: yast2-installation-control # Needed for tests BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) # Y2Storage::Crypttab.save_encryption_names BuildRequires: yast2-storage-ng >= 4.2.42 # 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.71 Requires: yast2-installation # product_update_summary, product_update_warning Requires: yast2-packager >= 4.2.33 -# Pkg.TargetInitializeOptions() -Requires: yast2-pkg-bindings >= 3.1.14 +# Improved Pkg.SourceRestore() +Requires: yast2-pkg-bindings >= 4.2.6 Requires: yast2-ruby-bindings >= 1.0.0 # use parallel gzip when crating backup (much faster) Requires: pigz @@ -87,7 +88,9 @@ %setup -q %build -%yast_build + +%check +%yast_check %install %yast_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/src/Makefile.am new/yast2-update-4.2.18/src/Makefile.am --- old/yast2-update-4.2.13/src/Makefile.am 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -# Sources for update - -module_DATA = \ - modules/Update.rb \ - modules/RootPart.rb \ - modules/SUSERelease.rb - -client_DATA = \ - clients/inst_rootpart.rb \ - clients/inst_update_partition_auto.rb \ - clients/rootpart_proposal.rb \ - clients/update.rb \ - clients/inst_update_partition.rb \ - clients/packages_proposal.rb \ - clients/update_proposal.rb \ - clients/inst_backup.rb \ - clients/run_update.rb \ - clients/backup_proposal.rb - -yncludedir = @yncludedir@/update -ynclude_DATA = \ - include/update/rootpart.rb - -desktop_DATA = \ - desktop/org.opensuse.yast.Update.desktop - -ylibclientdir = "${yast2dir}/lib/update/clients" -ylibclient_DATA = \ - lib/update/clients/inst_update_partition_auto.rb - -scalabledir = @icondir@/hicolor/scalable/apps -scalable_DATA = \ - icons/hicolor/scalable/apps/yast-update.svg - -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(desktop_DATA) $(ylibclient_DATA) $(scalable_DATA) - -include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/src/clients/update_proposal.rb new/yast2-update-4.2.18/src/clients/update_proposal.rb --- old/yast2-update-4.2.13/src/clients/update_proposal.rb 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/src/clients/update_proposal.rb 2020-03-12 10:48:31.000000000 +0100 @@ -286,7 +286,11 @@ ) # at least one must be there, the second one is for RPM v3 - rpm_db_files = ["/var/lib/rpm/Packages", "/var/lib/rpm/packages.rpm"] + rpm_db_files = [ + "/var/lib/rpm/Packages", + "/var/lib/rpm/packages.rpm", + "/var/lib/rpm/Packages.db" + ] ret = false file_found_or_error_skipped = false 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.18/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.18/src/include/update/rootpart.rb 2020-03-12 10:48:31.000000000 +0100 @@ -29,7 +29,9 @@ require "yast" require "y2packager/medium_type" +require "y2packager/original_repository_setup" require "y2packager/product_control_product" +require "y2packager/repository" module Yast module UpdateRootpartInclude @@ -505,6 +507,15 @@ end end 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, ignore the installation repositories + Y2Packager::OriginalRepositorySetup.instance.read(install_repos) + end end Convert.to_symbol(ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.2.13/test/Makefile.am new/yast2-update-4.2.18/test/Makefile.am --- old/yast2-update-4.2.13/test/Makefile.am 2020-01-07 11:52:53.000000000 +0100 +++ new/yast2-update-4.2.18/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -TESTS = \ - root_part_test.rb \ - suse_release_test.rb \ - inst_update_partition_auto_test.rb \ - packages_proposal_test.rb \ - update_test.rb - -TEST_EXTENSIONS = .rb -RB_LOG_COMPILER = rspec -VERBOSE = 1 -EXTRA_DIST = $(TESTS) -
