From f285be7d00daeed113bbf94745f1a477871541e0 Mon Sep 17 00:00:00 2001 From: Natnael Getahun Date: Tue, 17 Feb 2026 16:02:57 +0100 Subject: [PATCH 1/4] Update ERB initialization for ruby 3,4+ --- src/lib/rmt/ssl/config_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/rmt/ssl/config_generator.rb b/src/lib/rmt/ssl/config_generator.rb index 7d25783..f914b1b 100644 --- a/src/lib/rmt/ssl/config_generator.rb +++ b/src/lib/rmt/ssl/config_generator.rb @@ -49,6 +49,6 @@ def make_ca_config def make_server_config template = File.read(File.join(@templates_dir, 'rmt-server-cert.cnf.erb')) - ERB.new(template, nil, '<>').result(binding) + ERB.new(template, trim_mode: '<>').result(binding) end end From 88dc7ebd7086b0cbec94e47594549140c3377350 Mon Sep 17 00:00:00 2001 From: Natnael Getahun Date: Wed, 18 Feb 2026 16:56:37 +0100 Subject: [PATCH 2/4] Remove scc system sync checkbox --- spec/rmt/wizard_scc_page_spec.rb | 4 +--- src/lib/rmt/wizard_scc_page.rb | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/spec/rmt/wizard_scc_page_spec.rb b/spec/rmt/wizard_scc_page_spec.rb index d5289fd..0ab744f 100644 --- a/spec/rmt/wizard_scc_page_spec.rb +++ b/spec/rmt/wizard_scc_page_spec.rb @@ -23,7 +23,7 @@ describe RMT::WizardSCCPage do subject(:scc_page) { described_class.new(config) } - let(:config) { { 'scc' => { 'username' => 'user_mcuserface', 'password' => 'test', 'sync_systems' => true } } } + let(:config) { { 'scc' => { 'username' => 'user_mcuserface', 'password' => 'test', 'sync_systems' => false } } } describe '#render_content' do it 'renders UI elements' do @@ -34,7 +34,6 @@ expect(Yast::UI).to receive(:ChangeWidget).with(Id(:scc_username), :Value, config['scc']['username']) expect(Yast::UI).to receive(:ChangeWidget).with(Id(:scc_password), :Value, config['scc']['password']) - expect(Yast::UI).to receive(:ChangeWidget).with(Id(:scc_sync_systems), :Value, config['scc']['sync_systems']) scc_page.render_content end @@ -80,7 +79,6 @@ before do expect(Yast::UI).to receive(:QueryWidget).with(Id(:scc_username), :Value) expect(Yast::UI).to receive(:QueryWidget).with(Id(:scc_password), :Value) - expect(Yast::UI).to receive(:QueryWidget).with(Id(:scc_sync_systems), :Value) end context "when SCC credentials aren't valid and the error is not ignored" do diff --git a/src/lib/rmt/wizard_scc_page.rb b/src/lib/rmt/wizard_scc_page.rb index 248844f..fb37bb1 100644 --- a/src/lib/rmt/wizard_scc_page.rb +++ b/src/lib/rmt/wizard_scc_page.rb @@ -52,8 +52,6 @@ def render_content HSquash( MinWidth(30, Password(Id(:scc_password), _('Organization &Password'))) ), - VSpacing(1), - CheckBox(Id(:scc_sync_systems), _('Forward systems to SCC')), VSpacing(1) ), HSpacing(1) @@ -70,7 +68,6 @@ def render_content UI.ChangeWidget(Id(:scc_username), :Value, @config['scc']['username']) UI.ChangeWidget(Id(:scc_password), :Value, @config['scc']['password']) - UI.ChangeWidget(Id(:scc_sync_systems), :Value, @config['scc']['sync_systems']) end def abort_handler @@ -80,7 +77,7 @@ def abort_handler def skip_handler @config['scc']['username'] = UI.QueryWidget(Id(:scc_username), :Value) @config['scc']['password'] = UI.QueryWidget(Id(:scc_password), :Value) - @config['scc']['sync_systems'] = UI.QueryWidget(Id(:scc_sync_systems), :Value) + @config['scc']['sync_systems'] = false return unless Popup.AnyQuestion( _('Skip SCC registration?'), @@ -97,7 +94,7 @@ def skip_handler def next_handler @config['scc']['username'] = UI.QueryWidget(Id(:scc_username), :Value) @config['scc']['password'] = UI.QueryWidget(Id(:scc_password), :Value) - @config['scc']['sync_systems'] = UI.QueryWidget(Id(:scc_sync_systems), :Value) + @config['scc']['sync_systems'] = false return unless scc_credentials_valid? || Popup.AnyQuestion( _('Continue with invalid credentials?'), From d454e476264aacbb87e142aacf6499b30080f9cb Mon Sep 17 00:00:00 2001 From: Natnael Getahun Date: Tue, 24 Feb 2026 10:58:53 +0100 Subject: [PATCH 3/4] Opt-in scc system sync by default --- spec/rmt/wizard_scc_page_spec.rb | 2 +- src/lib/rmt/wizard_scc_page.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/rmt/wizard_scc_page_spec.rb b/spec/rmt/wizard_scc_page_spec.rb index 0ab744f..9fb8bf8 100644 --- a/spec/rmt/wizard_scc_page_spec.rb +++ b/spec/rmt/wizard_scc_page_spec.rb @@ -23,7 +23,7 @@ describe RMT::WizardSCCPage do subject(:scc_page) { described_class.new(config) } - let(:config) { { 'scc' => { 'username' => 'user_mcuserface', 'password' => 'test', 'sync_systems' => false } } } + let(:config) { { 'scc' => { 'username' => 'user_mcuserface', 'password' => 'test', 'sync_systems' => true } } } describe '#render_content' do it 'renders UI elements' do diff --git a/src/lib/rmt/wizard_scc_page.rb b/src/lib/rmt/wizard_scc_page.rb index fb37bb1..bb4f728 100644 --- a/src/lib/rmt/wizard_scc_page.rb +++ b/src/lib/rmt/wizard_scc_page.rb @@ -77,7 +77,7 @@ def abort_handler def skip_handler @config['scc']['username'] = UI.QueryWidget(Id(:scc_username), :Value) @config['scc']['password'] = UI.QueryWidget(Id(:scc_password), :Value) - @config['scc']['sync_systems'] = false + @config['scc']['sync_systems'] = true return unless Popup.AnyQuestion( _('Skip SCC registration?'), @@ -94,7 +94,7 @@ def skip_handler def next_handler @config['scc']['username'] = UI.QueryWidget(Id(:scc_username), :Value) @config['scc']['password'] = UI.QueryWidget(Id(:scc_password), :Value) - @config['scc']['sync_systems'] = false + @config['scc']['sync_systems'] = true return unless scc_credentials_valid? || Popup.AnyQuestion( _('Continue with invalid credentials?'), From 3724a67c500f3905c67948adb658edca72bb7bbf Mon Sep 17 00:00:00 2001 From: Natnael Getahun Date: Mon, 16 Mar 2026 11:58:36 +0100 Subject: [PATCH 4/4] Update changelog --- package/yast2-rmt.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/yast2-rmt.changes b/package/yast2-rmt.changes index 49ea389..c2356ef 100644 --- a/package/yast2-rmt.changes +++ b/package/yast2-rmt.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Mon Sep 1 10:06:04 UTC 2025 - Natnael Getahun -- Ensure compatibility with FIPS mode (bsc#1235462) - Version 1.3.7 +- Ensure compatibility with FIPS mode (bsc#1235462) +- Remove 'Forward systems to SCC' checkbox (scc-262) ------------------------------------------------------------------- Mon Mar 3 11:52:35 UTC 2025 - Luis Caparroz