Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2021-10-20 20:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old) and /work/SRC/openSUSE:Factory/.yast2-registration.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration" Wed Oct 20 20:22:51 2021 rev:75 rq:924867 version:4.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2021-07-18 23:44:54.727063155 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-registration.new.1890/yast2-registration.changes 2021-10-20 20:23:07.669335242 +0200 @@ -2,0 +3,8 @@ +Tue Oct 12 08:30:59 UTC 2021 - Ladislav Slez??k <[email protected]> + +- Fixed evaluating the update repositories (bsc#1188717), + the SUSE Manager update repositories were not disabled + when installing the system without updates +- 4.4.4 + +------------------------------------------------------------------- Old: ---- yast2-registration-4.4.3.tar.bz2 New: ---- yast2-registration-4.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.Vlecx1/_old 2021-10-20 20:23:08.837335963 +0200 +++ /var/tmp/diff_new_pack.Vlecx1/_new 2021-10-20 20:23:08.841335966 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.4.3 +Version: 4.4.4 Release: 0 Summary: YaST2 - Registration Module License: GPL-2.0-only ++++++ yast2-registration-4.4.3.tar.bz2 -> yast2-registration-4.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/.github/workflows/ci.yml new/yast2-registration-4.4.4/.github/workflows/ci.yml --- old/yast2-registration-4.4.3/.github/workflows/ci.yml 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/.github/workflows/ci.yml 2021-10-12 14:54:06.000000000 +0200 @@ -8,7 +8,9 @@ jobs: Tests: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: + image: registry.opensuse.org/yast/head/containers/yast-ruby:latest + options: --privileged steps: @@ -33,7 +35,9 @@ Rubocop: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: + image: registry.opensuse.org/yast/head/containers/yast-ruby:latest + options: --privileged steps: @@ -45,7 +49,9 @@ Package: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: + image: registry.opensuse.org/yast/head/containers/yast-ruby:latest + options: --privileged steps: @@ -57,7 +63,9 @@ Yardoc: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: + image: registry.opensuse.org/yast/head/containers/yast-ruby:latest + options: --privileged steps: @@ -71,7 +79,9 @@ # checks into one job avoids that overhead Checks: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: + image: registry.opensuse.org/yast/head/containers/yast-ruby:latest + options: --privileged steps: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/package/yast2-registration.changes new/yast2-registration-4.4.4/package/yast2-registration.changes --- old/yast2-registration-4.4.3/package/yast2-registration.changes 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/package/yast2-registration.changes 2021-10-12 14:54:06.000000000 +0200 @@ -1,5 +1,13 @@ ------------------------------------------------------------------- +Tue Oct 12 08:30:59 UTC 2021 - Ladislav Slez??k <[email protected]> + +- Fixed evaluating the update repositories (bsc#1188717), + the SUSE Manager update repositories were not disabled + when installing the system without updates +- 4.4.4 + +------------------------------------------------------------------- Fri Jul 16 07:20:58 UTC 2021 - Jos?? Iv??n L??pez Gonz??lez <[email protected]> - Show errors when loading addons fails (bsc#1187844). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/package/yast2-registration.spec new/yast2-registration-4.4.4/package/yast2-registration.spec --- old/yast2-registration-4.4.3/package/yast2-registration.spec 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/package/yast2-registration.spec 2021-10-12 14:54:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.4.3 +Version: 4.4.4 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.4.3/src/lib/registration/registration_ui.rb new/yast2-registration-4.4.4/src/lib/registration/registration_ui.rb --- old/yast2-registration-4.4.3/src/lib/registration/registration_ui.rb 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/src/lib/registration/registration_ui.rb 2021-10-12 14:54:06.000000000 +0200 @@ -234,7 +234,12 @@ # Or, try registering the paid add-ons with the base product's key: # eg. use SLES4SAP registration for HA. selected_addons.replace(try_register_addons(selected_addons, known_reg_codes)) - return :next if selected_addons.empty? + + if selected_addons.empty? + handle_updates + return :next + end + # cannot be helped by asking for regcodes return :back if selected_addons.all?(&:free) @@ -401,9 +406,6 @@ registration.register_product(product_data) end - # select repositories to use in installation (e.g. enable/disable Updates) - select_repositories(product_service) if Yast::Mode.installation || Yast::Mode.update - # remember the added service Storage::Cache.instance.addon_services << product_service @@ -413,6 +415,17 @@ success end + # enable/disable update repositories according to the user selection + def handle_updates + # select repositories to use in installation (e.g. enable/disable Updates) + return unless Yast::Mode.installation || Yast::Mode.update + + Storage::Cache.instance.addon_services.each do |product_service| + # select repositories to use in installation (e.g. enable/disable Updates) + select_repositories(product_service) + end + end + def select_repositories(product_service) # added update repositories updates = SwMgmt.service_repos(product_service, only_updates: true) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/test/inst_scc_test.rb new/yast2-registration-4.4.4/test/inst_scc_test.rb --- old/yast2-registration-4.4.3/test/inst_scc_test.rb 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/test/inst_scc_test.rb 2021-10-12 14:54:06.000000000 +0200 @@ -20,6 +20,7 @@ allow(subject).to receive(:init_registration) allow(Registration::Addon).to receive(:find_all).and_return([]) allow(::Installation::InstallationInfo.instance).to receive(:add_callback).with("registration") + allow(Yast::Report).to receive(:Error) end context "the system is already registered" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/test/migration_repos_workflow_spec.rb new/yast2-registration-4.4.4/test/migration_repos_workflow_spec.rb --- old/yast2-registration-4.4.3/test/migration_repos_workflow_spec.rb 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/test/migration_repos_workflow_spec.rb 2021-10-12 14:54:06.000000000 +0200 @@ -20,6 +20,7 @@ allow(Yast::Linuxrc).to receive(:InstallInf) allow(Y2Packager::MediumType).to receive(:offline?).and_return(false) allow(Y2Packager::MediumType).to receive(:online?).and_return(false) + allow(Yast::Report).to receive(:Error) end shared_examples "media based upgrade" do |popup_method| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/test/registration/clients/scc_auto_test.rb new/yast2-registration-4.4.4/test/registration/clients/scc_auto_test.rb --- old/yast2-registration-4.4.3/test/registration/clients/scc_auto_test.rb 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/test/registration/clients/scc_auto_test.rb 2021-10-12 14:54:06.000000000 +0200 @@ -16,6 +16,10 @@ describe Registration::Clients::SCCAuto do let(:config) { ::Registration::Storage::Config.instance } + before do + allow(Yast::Report).to receive(:Error) + end + describe "#summary" do it "returns string with config description" do expect(subject.summary).to be_a(::String) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/test/registration/ui/addon_eula_dialog_test.rb new/yast2-registration-4.4.4/test/registration/ui/addon_eula_dialog_test.rb --- old/yast2-registration-4.4.3/test/registration/ui/addon_eula_dialog_test.rb 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/test/registration/ui/addon_eula_dialog_test.rb 2021-10-12 14:54:06.000000000 +0200 @@ -34,6 +34,7 @@ allow(Yast::Wizard).to receive(:SetContents) allow(dialog).to receive(:find_license).and_return(product_license) allow(dialog).to receive(:download_eula).and_return(true) + allow(Yast::Report).to receive(:Error) registered_addon.registered end @@ -162,6 +163,7 @@ .and_return(license_content) allow(dialog).to receive(:setup_eula_dialog) allow(dialog).to receive(:run_eula_dialog) + allow(Yast::Report).to receive(:Error) end context "when the eula could not be downloaded" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.4.3/test/registration_ui_test.rb new/yast2-registration-4.4.4/test/registration_ui_test.rb --- old/yast2-registration-4.4.3/test/registration_ui_test.rb 2021-07-16 14:14:59.000000000 +0200 +++ new/yast2-registration-4.4.4/test/registration_ui_test.rb 2021-10-12 14:54:06.000000000 +0200 @@ -120,6 +120,33 @@ # stub the registration allow(registration).to receive(:register_product) + allow(Registration::SwMgmt).to receive(:service_repos).and_return([]) + allow(registration_ui).to receive(:handle_updates) + end + + it "disables update repositories if requested" do + # unmock the call + allow(registration_ui).to receive(:handle_updates).and_call_original + + allow(registration_ui).to receive(:try_register_addons).and_return([]) + + prod_service = double("Product service") + allow(Registration::Storage::Cache.instance).to receive(:addon_services) + .and_return([prod_service]) + + update_repo = double("Update repo") + allow(Registration::SwMgmt).to receive(:service_repos) + .with(prod_service, only_updates: true).and_return([update_repo]) + + # user does not want to install the updates + allow(registration_ui).to receive(:install_updates?).and_return(false) + + # make sure the update repo is disabled + expect(Registration::SwMgmt).to receive(:set_repos_state) + .with([update_repo], false) + + # Register Legacy module + registration_ui.register_addons([addon_legacy], {}) end context "when the addons are free" do
