Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package/yast2-rmt.changes
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
-------------------------------------------------------------------
Mon Sep 1 10:06:04 UTC 2025 - Natnael Getahun <natnael.getahun@suse.com>

- 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 <luis.caparroz@suse.com>
Expand Down
2 changes: 0 additions & 2 deletions spec/rmt/wizard_scc_page_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/rmt/ssl/config_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 2 additions & 5 deletions src/lib/rmt/wizard_scc_page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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'] = true

return unless Popup.AnyQuestion(
_('Skip SCC registration?'),
Expand All @@ -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'] = true

return unless scc_credentials_valid? || Popup.AnyQuestion(
_('Continue with invalid credentials?'),
Expand Down
Loading