Hello community, here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2020-10-18 16:20:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old) and /work/SRC/openSUSE:Factory/.yast2-registration.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration" Sun Oct 18 16:20:13 2020 rev:60 rq:840147 version:4.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2020-08-28 21:20:33.392300766 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-registration.new.3486/yast2-registration.changes 2020-10-18 16:20:14.476459311 +0200 @@ -1,0 +2,14 @@ +Wed Oct 7 21:26:11 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- Do not export the registration e-mail if it is not defined + (bsc#1177135). +- 4.3.10 + +------------------------------------------------------------------- +Thu Oct 1 14:15:55 UTC 2020 - Ladislav Slezák <lsle...@suse.cz> + +- Fixed upgrade using the Full medium with the "media_upgrade=1" + boot option (bsc#1176563) +- 4.3.9 + +------------------------------------------------------------------- Old: ---- yast2-registration-4.3.8.tar.bz2 New: ---- yast2-registration-4.3.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.uixZOP/_old 2020-10-18 16:20:16.604460258 +0200 +++ /var/tmp/diff_new_pack.uixZOP/_new 2020-10-18 16:20:16.608460260 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-registration # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: yast2-registration -Version: 4.3.8 +Version: 4.3.10 Release: 0 Summary: YaST2 - Registration Module License: GPL-2.0-only Group: System/YaST -Url: https://github.com/yast/yast-registration +URL: https://github.com/yast/yast-registration Source0: %{name}-%{version}.tar.bz2 ++++++ yast2-registration-4.3.8.tar.bz2 -> yast2-registration-4.3.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.3.8/.rubocop.yml new/yast2-registration-4.3.10/.rubocop.yml --- old/yast2-registration-4.3.8/.rubocop.yml 2020-08-24 13:46:34.000000000 +0200 +++ new/yast2-registration-4.3.10/.rubocop.yml 2020-10-08 08:03:04.000000000 +0200 @@ -18,7 +18,7 @@ # TODO: this need some non-trivial refactoring... Metrics/ClassLength: - Max: 470 + Max: 480 # TODO: this need some non-trivial refactoring... Metrics/CyclomaticComplexity: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.3.8/package/yast2-registration.changes new/yast2-registration-4.3.10/package/yast2-registration.changes --- old/yast2-registration-4.3.8/package/yast2-registration.changes 2020-08-24 13:46:34.000000000 +0200 +++ new/yast2-registration-4.3.10/package/yast2-registration.changes 2020-10-08 08:03:04.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Oct 7 21:26:11 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- Do not export the registration e-mail if it is not defined + (bsc#1177135). +- 4.3.10 + +------------------------------------------------------------------- +Thu Oct 1 14:15:55 UTC 2020 - Ladislav Slezák <lsle...@suse.cz> + +- Fixed upgrade using the Full medium with the "media_upgrade=1" + boot option (bsc#1176563) +- 4.3.9 + +------------------------------------------------------------------- Mon Aug 24 11:31:58 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> - AutoYaST: the release_type element is not mandatory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.3.8/package/yast2-registration.spec new/yast2-registration-4.3.10/package/yast2-registration.spec --- old/yast2-registration-4.3.8/package/yast2-registration.spec 2020-08-24 13:46:34.000000000 +0200 +++ new/yast2-registration-4.3.10/package/yast2-registration.spec 2020-10-08 08:03:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.3.8 +Version: 4.3.10 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.3.8/src/lib/registration/storage/config.rb new/yast2-registration-4.3.10/src/lib/registration/storage/config.rb --- old/yast2-registration-4.3.8/src/lib/registration/storage/config.rb 2020-08-24 13:46:34.000000000 +0200 +++ new/yast2-registration-4.3.10/src/lib/registration/storage/config.rb 2020-10-08 08:03:04.000000000 +0200 @@ -73,11 +73,10 @@ ret.merge!( "reg_server" => reg_server, "slp_discovery" => slp_discovery, - "email" => email, "reg_code" => reg_code, "install_updates" => install_updates ) - + ret["email"] = email if email ret["addons"] = export_addons ret.merge!(export_ssl_config) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.3.8/src/lib/registration/ui/base_system_registration_dialog.rb new/yast2-registration-4.3.10/src/lib/registration/ui/base_system_registration_dialog.rb --- old/yast2-registration-4.3.8/src/lib/registration/ui/base_system_registration_dialog.rb 2020-08-24 13:46:34.000000000 +0200 +++ new/yast2-registration-4.3.10/src/lib/registration/ui/base_system_registration_dialog.rb 2020-10-08 08:03:04.000000000 +0200 @@ -427,8 +427,8 @@ "<p>" + _("You are skipping registration.") + medium_access_text + "</p>" + # TRANSLATORS: # Popup question: confirm skipping the registration on the Full medium - _("<p>Without registration update-channels will not be configured.\n"\ - "This will disable the updates and security fixes.</p>") + _("<p>Without registration the system\n" \ + "will not have access to updates and security fixes.</p>") end def medium_access_text @@ -463,8 +463,8 @@ # TRANSLATORS: a popup message (3/3) the user wants to skip the registration warning += "\n" + - _("<p>However, without registration the system will not have access\n" \ - "to the updates and security fixes.</p>") + _("<p>However, without registration the system will not have access\n" \ + "to updates and security fixes.</p>") end warning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.3.8/src/lib/registration/ui/migration_repos_workflow.rb new/yast2-registration-4.3.10/src/lib/registration/ui/migration_repos_workflow.rb --- old/yast2-registration-4.3.8/src/lib/registration/ui/migration_repos_workflow.rb 2020-08-24 13:46:34.000000000 +0200 +++ new/yast2-registration-4.3.10/src/lib/registration/ui/migration_repos_workflow.rb 2020-10-08 08:03:04.000000000 +0200 @@ -563,13 +563,24 @@ end # check the system status at upgrade and return the symbol for the next step - # @return [Symabol] workflow symbol, :skip => do not use the SCC/SMT/RMT upgrade + # @return [Symbol] workflow symbol, :skip => do not use the SCC/SMT/RMT upgrade # (unregistered system or explicitly requested by user), :next => # continue with the SCC/SMT/RMT based upgrade def system_upgrade_check log.info "System upgrade mode detected" # media based upgrade requested by user if Yast::Linuxrc.InstallInf("MediaUpgrade") == "1" + # we cannot do medium based upgrade using the Online medium, + # it does not contain any packages + if Y2Packager::MediumType.online? + log.warn "The Online medium cannot be used with the media_upgrade=1 boot option" + Yast::Popup.LongMessage(online_media_upgrade) + return :abort + end + + # add the Full medium base product repository + add_offline_base_product + explicit_media_upgrade return :skip # the system is registered, continue with the SCC/SMT/RMT based upgrade @@ -754,6 +765,21 @@ end # Informative message + # @return [String] translated message + def online_media_upgrade + # TRANSLATORS: Media upgrade forced but the Online medium was detected (1/2) + # Message displayed during upgrade when the Online medium is used + # with the "media_upgrade=1" boot option. The Online medium does not + # contain any packages and it cannot be used in this case, Full medium + # is required. Use the RichText format. + _("<h2>Online Medium</h2><p>The media based upgrade was requested, "\ + "but you are using the Online medium which does not provide any packages "\ + "to install.</p>") + + # TRANSLATORS: Force media upgrade, Online medium detected (2/2) + _("<p>Please use the Full medium instead of the Online.</p>") + end + + # Informative message # @param registered [Boolean] is the system registered? # @return [String] translated message def media_upgrade(registered) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.3.8/test/registration/storage/config_test.rb new/yast2-registration-4.3.10/test/registration/storage/config_test.rb --- old/yast2-registration-4.3.8/test/registration/storage/config_test.rb 2020-08-24 13:46:34.000000000 +0200 +++ new/yast2-registration-4.3.10/test/registration/storage/config_test.rb 2020-10-08 08:03:04.000000000 +0200 @@ -81,6 +81,17 @@ "reg_code" => "FOOBAR42" ) end + + context "when the email is nil" do + before do + subject.do_registration = true + subject.email = nil + end + + it "does not include the email" do + expect(subject.export.keys).to_not include("email") + end + end end describe "#import" do
