Hello community, here is the log from the commit of package yast2-rmt for openSUSE:Factory checked in at 2018-11-08 09:48:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-rmt (Old) and /work/SRC/openSUSE:Factory/.yast2-rmt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-rmt" Thu Nov 8 09:48:51 2018 rev:10 rq:646623 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-rmt/yast2-rmt.changes 2018-10-15 09:42:48.867408597 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-rmt.new/yast2-rmt.changes 2018-11-08 09:48:58.533065517 +0100 @@ -1,0 +2,14 @@ +Mon Oct 29 12:57:32 UTC 2018 - [email protected] + +- version 1.1.1 +- Translation fixes +- Follow YaST text style guide +- Remove broken back-buttons + +------------------------------------------------------------------- +Mon Oct 29 10:04:20 UTC 2018 - [email protected] + +- version 1.1.0 +- Add setup step to open firewall ports for HTTP and HTTPS (fate#326634) + +------------------------------------------------------------------- Old: ---- yast2-rmt-1.0.4.tar.bz2 New: ---- yast2-rmt-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-rmt.spec ++++++ --- /var/tmp/diff_new_pack.3C5WIR/_old 2018-11-08 09:48:58.953065022 +0100 +++ /var/tmp/diff_new_pack.3C5WIR/_new 2018-11-08 09:48:58.953065022 +0100 @@ -17,7 +17,7 @@ Name: yast2-rmt -Version: 1.0.4 +Version: 1.1.1 Release: 0 BuildArch: noarch @@ -38,9 +38,9 @@ BuildRequires: rubygem(rspec) Summary: YaST2 - Module to configure RMT -License: GPL-2.0-only OR GPL-3.0-only +License: GPL-2.0-only Group: System/YaST -Url: https://github.com/SUSE/yast2-rmt +Url: https://github.com/yast/yast-rmt %description Provides the YaST module to configure the Repository Mirroring Tool (RMT) Server. ++++++ yast2-rmt-1.0.4.tar.bz2 -> yast2-rmt-1.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/PACKAGE.md new/yast2-rmt-1.1.1/PACKAGE.md --- old/yast2-rmt-1.0.4/PACKAGE.md 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/PACKAGE.md 2018-10-31 16:31:23.000000000 +0100 @@ -2,7 +2,7 @@ ### Creating the tarball for packaging -To create the tarball for testing or packaing run: +To create the tarball for testing or packaging run: ``` rake package @@ -41,15 +41,15 @@ ##### Submit maintenance updates for SLES to the Internal Build Service -###### Get target codesteams where to submit +###### Get target codestreams where to submit -To checkout in which codestreams the package is currently maintaned, run: +To check out which codestreams the package is currently maintained in, run: ```bash osc -A https://api.suse.de maintained yast2-rmt ``` -For a more detailed view which target codestreams are in which state checkout: [Codestream overview](https://maintenance.suse.de/maintained/?package=yast2-rmt) +For a more detailed view which target codestreams are in which state, check out: [Codestream overview](https://maintenance.suse.de/maintained/?package=yast2-rmt) ###### Submit updates @@ -76,4 +76,4 @@ You can check the status of your requests [here](https://build.opensuse.org/package/requests/systemsmanagement:SCC:RMT/yast2-rmt) and [here](https://build.suse.de/package/requests/Devel:SCC:RMT/yast2-rmt). -After your requests got accepted, they still have to pass maintenance testing before they get released to customers. You can check their progress at [maintenance.suse.de](https://maintenance.suse.de/search/?q=yast2-rmt). If you still need help, the maintenance team can be reached at [[email protected]]([email protected]) or #maintenance on irc.suse.de. +After your requests have been accepted, they still have to pass maintenance testing before they are released to customers. You can check their progress at [maintenance.suse.de](https://maintenance.suse.de/search/?q=yast2-rmt). If you still need help, the maintenance team can be reached at [[email protected]]([email protected]) or #maintenance on irc.suse.de. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/README.md new/yast2-rmt-1.1.1/README.md --- old/yast2-rmt-1.0.4/README.md 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/README.md 2018-10-31 16:31:23.000000000 +0100 @@ -29,3 +29,8 @@ docker build -t yast-rmt-image . docker run -it yast-rmt-image rspec ``` + +### Resources + +- [YaST Style Guide](https://en.opensuse.org/openSUSE:YaST_style_guide) +- [YaST Localization](https://yastgithubio.readthedocs.io/en/latest/localization/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/package/yast2-rmt.changes new/yast2-rmt-1.1.1/package/yast2-rmt.changes --- old/yast2-rmt-1.0.4/package/yast2-rmt.changes 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/package/yast2-rmt.changes 2018-10-31 16:31:23.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Oct 29 12:57:32 UTC 2018 - [email protected] + +- version 1.1.1 +- Translation fixes +- Follow YaST text style guide +- Remove broken back-buttons + +------------------------------------------------------------------- +Mon Oct 29 10:04:20 UTC 2018 - [email protected] + +- version 1.1.0 +- Add setup step to open firewall ports for HTTP and HTTPS (fate#326634) + +------------------------------------------------------------------- Wed Oct 3 14:21:13 UTC 2018 - [email protected] - version 1.0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/package/yast2-rmt.spec new/yast2-rmt-1.1.1/package/yast2-rmt.spec --- old/yast2-rmt-1.0.4/package/yast2-rmt.spec 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/package/yast2-rmt.spec 2018-10-31 16:31:23.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-rmt -Version: 1.0.4 +Version: 1.1.1 Release: 0 BuildArch: noarch @@ -40,7 +40,7 @@ Summary: YaST2 - Module to configure RMT License: GPL-2.0 or GPL-3.0 Group: System/YaST -Url: https://github.com/SUSE/yast2-rmt +Url: https://github.com/yast/yast-rmt %description Provides the YaST module to configure the Repository Mirroring Tool (RMT) Server. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/spec/rmt/utils_spec.rb new/yast2-rmt-1.1.1/spec/rmt/utils_spec.rb --- old/yast2-rmt-1.0.4/spec/rmt/utils_spec.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/spec/rmt/utils_spec.rb 2018-10-31 16:31:23.000000000 +0100 @@ -47,7 +47,7 @@ YAML.dump(config) ).and_return(true) - expect(Yast::Popup).to receive(:Message).with('Configuration written successfully') + expect(Yast::Popup).to receive(:Message).with('Configuration written successfully.') described_class.write_config_file(config) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/spec/rmt/wizard_final_page_spec.rb new/yast2-rmt-1.1.1/spec/rmt/wizard_final_page_spec.rb --- old/yast2-rmt-1.0.4/spec/rmt/wizard_final_page_spec.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/spec/rmt/wizard_final_page_spec.rb 2018-10-31 16:31:23.000000000 +0100 @@ -66,7 +66,7 @@ end describe '#run' do - it 'restarts rmt-server service and enters event loop' do + it 'enters event loop' do expect(final_page).to receive(:render_content) expect(final_page).to receive(:event_loop) final_page.run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/spec/rmt/wizard_firewall_page_spec.rb new/yast2-rmt-1.1.1/spec/rmt/wizard_firewall_page_spec.rb --- old/yast2-rmt-1.0.4/spec/rmt/wizard_firewall_page_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-rmt-1.1.1/spec/rmt/wizard_firewall_page_spec.rb 2018-10-31 16:31:23.000000000 +0100 @@ -0,0 +1,52 @@ +# Copyright (c) 2018 SUSE LLC. +# All Rights Reserved. + +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 or 3 of the GNU General +# Public License as published by the Free Software Foundation. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact SUSE LLC. + +# To contact SUSE about this file by physical or electronic mail, +# you may find current contact information at www.suse.com + +require 'rmt/wizard_firewall_page' + +describe RMT::WizardFirewallPage do + subject(:firewall_page) { described_class.new } + + let(:firewalld_double) { instance_double(Y2Firewall::Firewalld) } + + before { allow(Y2Firewall::Firewalld).to receive(:instance).and_return(firewalld_double) } + + describe '#contents' do + context 'with firewalld enabled' do + it 'renders firewall widget' do + expect(firewalld_double).to receive(:installed?).and_return(true) + expect(firewalld_double).to receive(:enabled?).and_return(true) + expect(RMT::WizardFirewallPage::FirewallWidget).to receive(:new) + + firewall_page.contents + end + end + + context 'without firewalld enabled' do + it 'only renders info text' do + expect(firewalld_double).to receive(:installed?).and_return(true) + expect(firewalld_double).to receive(:enabled?).and_return(false) + expect(RMT::WizardFirewallPage::FirewallWidget).not_to receive(:new) + expect(firewall_page).to receive(:Label).with( + "Firewalld is not enabled.\n\nIf you enable firewalld later,\nremember to open the firewall ports for HTTP and HTTPS." + ) + + firewall_page.contents + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/spec/rmt/wizard_maria_db_page_spec.rb new/yast2-rmt-1.1.1/spec/rmt/wizard_maria_db_page_spec.rb --- old/yast2-rmt-1.0.4/spec/rmt/wizard_maria_db_page_spec.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/spec/rmt/wizard_maria_db_page_spec.rb 2018-10-31 16:31:23.000000000 +0100 @@ -110,7 +110,7 @@ it 'if current root password is empty, reports an error if setting new password failed' do expect(new_password_dialog_double).to receive(:run).and_return(password) expect(new_password_dialog_double).to receive(:set_root_password).and_return(false) - expect(Yast::Report).to receive(:Error).with('Setting new database root password failed') + expect(Yast::Report).to receive(:Error).with('Setting new database root password failed.') expect(mariadb_page).not_to receive(:finish_dialog) mariadb_page.next_handler end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/spec/rmt/wizard_scc_page_spec.rb new/yast2-rmt-1.1.1/spec/rmt/wizard_scc_page_spec.rb --- old/yast2-rmt-1.0.4/spec/rmt/wizard_scc_page_spec.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/spec/rmt/wizard_scc_page_spec.rb 2018-10-31 16:31:23.000000000 +0100 @@ -30,7 +30,6 @@ expect(Yast::Wizard).to receive(:SetAbortButton).with(:abort, Yast::Label.CancelButton) expect(Yast::Wizard).to receive(:SetNextButton).with(:next, Yast::Label.NextButton) expect(Yast::Wizard).to receive(:SetContents) - expect(Yast::Wizard).to receive(:DisableBackButton) 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']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/spec/rmt/wizard_spec.rb new/yast2-rmt-1.1.1/spec/rmt/wizard_spec.rb --- old/yast2-rmt-1.0.4/spec/rmt/wizard_spec.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/spec/rmt/wizard_spec.rb 2018-10-31 16:31:23.000000000 +0100 @@ -30,9 +30,10 @@ let(:db_page_double) { instance_double(RMT::WizardMariaDBPage) } let(:service_page_double) { instance_double(RMT::WizardRMTServicePage) } let(:ssl_page_double) { instance_double(RMT::WizardSSLPage) } + let(:firewall_page_double) { instance_double(RMT::WizardFirewallPage) } let(:final_page_double) { instance_double(RMT::WizardFinalPage) } - it 'runs and goes through the sequence' do + it 'runs and goes through the sequence' do # rubocop:disable RSpec/ExampleLength expect(Yast::Confirm).to receive(:MustBeRoot).and_return(true) expect(RMT::Utils).to receive(:read_config_file).and_return({}) @@ -51,6 +52,9 @@ expect(RMT::WizardSSLPage).to receive(:new).and_return(ssl_page_double) expect(ssl_page_double).to receive(:run).and_return(:next) + expect(RMT::WizardFirewallPage).to receive(:new).and_return(firewall_page_double) + expect(firewall_page_double).to receive(:run).and_return(:next) + expect(RMT::WizardFinalPage).to receive(:new).and_return(final_page_double) expect(final_page_double).to receive(:run).and_return(:next) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/utils.rb new/yast2-rmt-1.1.1/src/lib/rmt/utils.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/utils.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/src/lib/rmt/utils.rb 2018-10-31 16:31:23.000000000 +0100 @@ -56,7 +56,7 @@ def write_config_file(config) if Yast::SCR.Write(Yast.path('.target.string'), CONFIG_FILENAME, YAML.dump(config)) - Yast::Popup.Message(_('Configuration written successfully')) + Yast::Popup.Message(_('Configuration written successfully.')) else Yast::Report.Error(_('Writing configuration file failed. See YaST logs for details.')) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/wizard.rb new/yast2-rmt-1.1.1/src/lib/rmt/wizard.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/wizard.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/src/lib/rmt/wizard.rb 2018-10-31 16:31:23.000000000 +0100 @@ -21,6 +21,7 @@ require 'rmt/wizard_maria_db_page' require 'rmt/wizard_ssl_page' require 'rmt/wizard_rmt_service_page' +require 'rmt/wizard_firewall_page' require 'rmt/wizard_final_page' module RMT @@ -49,7 +50,8 @@ 'step1' => -> { RMT::WizardSCCPage.new(@config).run }, 'step2' => -> { RMT::WizardMariaDBPage.new(@config).run }, 'step3' => -> { RMT::WizardSSLPage.new(@config).run }, - 'step4' => -> { RMT::WizardRMTServicePage.new(@config).run }, + 'step4' => -> { RMT::WizardFirewallPage.run }, + 'step5' => -> { RMT::WizardRMTServicePage.new(@config).run }, 'finish' => -> { RMT::WizardFinalPage.new(@config).run } } @@ -58,15 +60,17 @@ 'step1' => { abort: :abort, next: 'step2' }, 'step2' => { abort: :abort, next: 'step3' }, 'step3' => { abort: :abort, next: 'step4' }, - 'step4' => { abort: :abort, next: 'finish' }, + 'step4' => { abort: :abort, next: 'step5' }, + 'step5' => { abort: :abort, next: 'finish' }, 'finish' => { abort: :abort, next: :next } } - Wizard.CreateDialog() + Wizard.CreateDialog + Wizard.HideBackButton Wizard.SetTitleIcon('yast-rmt') Sequencer.Run(aliases, sequence) - UI.CloseDialog() + UI.CloseDialog end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/wizard_final_page.rb new/yast2-rmt-1.1.1/src/lib/rmt/wizard_final_page.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/wizard_final_page.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/src/lib/rmt/wizard_final_page.rb 2018-10-31 16:31:23.000000000 +0100 @@ -19,6 +19,7 @@ require 'ui/event_dispatcher' require 'rmt/ssl/certificate_generator' require 'rmt/utils' +require 'y2firewall/firewalld' module RMT; end @@ -45,24 +46,24 @@ Left(Heading(_('SCC Organization:'))), Left(Label(@config['scc']['username'])), VSpacing(1), - Left(Heading(_('RMT config file path:'))), + Left(Heading(_('RMT Config File Path:'))), Left(Label(RMT::Utils::CONFIG_FILENAME.to_s)), VSpacing(1), - Left(Heading(_('SSL certificate path:'))), + Left(Heading(_('SSL Certificate Path:'))), Left(Label(RMT::SSL::CertificateGenerator::RMT_SSL_DIR.to_s)), VSpacing(1), - Left(Heading(_('Database username:'))), + Left(Heading(_('Database Username:'))), Left(Label(@config['database']['username'])), VSpacing(1), - Left(Label(_('Please ensure that any firewall is configured'))), - Left(Label(_('to allow access to RMT (default ports 80 and 443)'))) + Left(Heading(_('Firewall:'))), + Left(Label(RMT::WizardFirewallPage::FirewallWidget.new.status_label)) ) ), HStretch() ) Wizard.SetContents( - _('RMT configuration summary'), + _('RMT Configuration - Summary'), contents, _('<p>This is a list of all RMT configuration performed by this wizard.</p><p>Please check for anything that is incorrect.</p>'), true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/wizard_firewall_page.rb new/yast2-rmt-1.1.1/src/lib/rmt/wizard_firewall_page.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/wizard_firewall_page.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-rmt-1.1.1/src/lib/rmt/wizard_firewall_page.rb 2018-10-31 16:31:23.000000000 +0100 @@ -0,0 +1,152 @@ +# Copyright (c) 2018 SUSE LLC. +# All Rights Reserved. + +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 or 3 of the GNU General +# Public License as published by the Free Software Foundation. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact SUSE LLC. + +# To contact SUSE about this file by physical or electronic mail, +# you may find current contact information at www.suse.com + +require 'y2firewall/firewalld' +require 'rmt/utils' +require 'cwm/dialog' +require 'cwm/custom_widget' + +Yast.import 'CWMFirewallInterfaces' + +module RMT; end + +class RMT::WizardFirewallPage < CWM::Dialog + def initialize + textdomain 'rmt' + end + + def title + _('RMT Configuration - Step 4/5') + end + + def abort_button + Yast::Label.CancelButton # to be consistent with the other pages + end + + def back_button + '' # omit the button + end + + def contents + if firewalld.installed? && firewalld.enabled? + HBox( + HStretch(), + FirewallWidget.new, + HStretch() + ) + else + VCenter( + Label(_("Firewalld is not enabled.\n\nIf you enable firewalld later,\nremember to open the firewall ports for HTTP and HTTPS.")) + ) + end + end + + def run + read_config + result = super + write_config if result == :next + result + end + + # Widget for opening HTTP & HTTPS services in the firewall + class FirewallWidget < CWM::CustomWidget + attr_accessor :cwm_interfaces + + def initialize + textdomain 'rmt' + + @cwm_interfaces = Yast::CWMFirewallInterfaces.CreateOpenFirewallWidget( + 'services' => services, + 'display_details' => true, + 'open_firewall_checkbox' => _('Open Ports for HTTP and HTTPS in Firewall') + ) + end + + def init + Yast::CWMFirewallInterfaces.OpenFirewallInit(@cwm_interfaces, '') + end + + def contents + @cwm_interfaces['custom_widget'] + end + + def help + _('RMT requires firewall ports for HTTP and HTTPS to be open to work properly.') + end + + def handle(event) + Yast::CWMFirewallInterfaces.OpenFirewallHandle(@cwm_interfaces, '', event) + end + + def store + Yast::CWMFirewallInterfaces.StoreAllowedInterfaces(services) + end + + def validate + open? || Yast::Popup.AnyQuestion( + _('Firewall ports not opened'), + _('Do you want to continue without opening the firewall ports for RMT?'), + _('Ignore and continue'), + _('Go back'), + :focus_no + ) + end + + def services + ['http', 'https'] + end + + def status_label + Yast::CWMFirewallInterfaces.current_firewall_status_label + end + + private + + def open? + Yast::UI.QueryWidget(Id('_cwm_open_firewall'), :Value) + end + + class Yast::CWMFirewallInterfacesClass + # add public method to access private information + def current_firewall_status_label + firewall_status_label(current_firewall_status) + end + end + end + + private + + # This is not required but it is more elegant than using the complete call every time + def firewalld + Y2Firewall::Firewalld.instance + end + + def read_config + return if !(firewalld.installed? && firewalld.enabled?) || firewalld.read? + Yast::Popup.Feedback(_('Please wait'), _('Reading firewall settings ...')) do + firewalld.read + end + end + + def write_config + return unless firewalld.installed? && firewalld.enabled? && firewalld.modified? + Yast::Popup.Feedback(_('Please wait'), _('Writing firewall settings ...')) do + firewalld.write + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/wizard_maria_db_page.rb new/yast2-rmt-1.1.1/src/lib/rmt/wizard_maria_db_page.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/wizard_maria_db_page.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/src/lib/rmt/wizard_maria_db_page.rb 2018-10-31 16:31:23.000000000 +0100 @@ -41,16 +41,16 @@ def render_content contents = Frame( - _('Database credentials'), + _('Database Credentials'), HBox( HSpacing(1), VBox( VSpacing(1), HSquash( - MinWidth(30, InputField(Id(:db_username), _('Database &username'))) + MinWidth(30, InputField(Id(:db_username), _('Database &Username'))) ), HSquash( - MinWidth(30, Password(Id(:db_password), _('Database &password'))) + MinWidth(30, Password(Id(:db_password), _('Database &Password'))) ), VSpacing(1) ), @@ -60,7 +60,7 @@ Wizard.SetNextButton(:next, Label.NextButton) Wizard.SetContents( - _('RMT configuration step 2/4'), + _('RMT Configuration - Step 2/5'), contents, _('<p>This step of the wizard performs the necessary database setup.</p>'), true, @@ -90,7 +90,7 @@ new_root_password = dialog.run if !new_root_password || new_root_password.empty? || !dialog.set_root_password(new_root_password, @config['database']['host']) - Report.Error(_('Setting new database root password failed')) + Report.Error(_('Setting new database root password failed.')) return end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/wizard_rmt_service_page.rb new/yast2-rmt-1.1.1/src/lib/rmt/wizard_rmt_service_page.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/wizard_rmt_service_page.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/src/lib/rmt/wizard_rmt_service_page.rb 2018-10-31 16:31:23.000000000 +0100 @@ -40,14 +40,14 @@ HSpacing(1), VBox( HSquash( - Label(Id(:service_status), 'Service \'rmt-server\' started, sync and mirroring systemd timers active.') + Label(Id(:service_status), _("Service 'rmt-server' started, sync and mirroring systemd timers active.")) ) ) ) ) Wizard.SetContents( - _('RMT configuration step 4/4'), + _('RMT Configuration - Step 5/5'), contents, _('<p>Starting the necessary services for RMT.</p>'), true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/wizard_scc_page.rb new/yast2-rmt-1.1.1/src/lib/rmt/wizard_scc_page.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/wizard_scc_page.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/src/lib/rmt/wizard_scc_page.rb 2018-10-31 16:31:23.000000000 +0100 @@ -36,16 +36,16 @@ Wizard.SetNextButton(:next, Label.NextButton) contents = Frame( - _('SCC organization credentials'), + _('Organization Credentials'), HBox( HSpacing(1), VBox( VSpacing(1), HSquash( - MinWidth(30, InputField(Id(:scc_username), _('Organization &username'))) + MinWidth(30, InputField(Id(:scc_username), _('Organization &Username'))) ), HSquash( - MinWidth(30, Password(Id(:scc_password), _('Organization &password'))) + MinWidth(30, Password(Id(:scc_password), _('Organization &Password'))) ), VSpacing(1) ), @@ -54,15 +54,13 @@ ) Wizard.SetContents( - _('RMT configuration step 1/4'), + _('RMT Configuration - Step 1/5'), contents, - _("<p>Organization credentials can be found on Organization page at <a href='https://scc.suse.com/'>SUSE Customer Center</a>.</p>"), + _("<p>Organization credentials can be found on the Organization page at <a href='https://scc.suse.com/'>SUSE Customer Center</a>.</p>"), true, true ) - Wizard.DisableBackButton - UI.ChangeWidget(Id(:scc_username), :Value, @config['scc']['username']) UI.ChangeWidget(Id(:scc_password), :Value, @config['scc']['password']) end @@ -76,8 +74,8 @@ @config['scc']['password'] = UI.QueryWidget(Id(:scc_password), :Value) return unless scc_credentials_valid? || Popup.AnyQuestion( - _('Invalid SCC credentials'), - _('SCC credentials are invalid. Please check the credentials.'), + _('Continue with invalid credentials?'), + _("Organization credentials are invalid.\nRMT will not be able to sync and mirror data.\n\nDo you want to continue?"), _('Ignore and continue'), _('Go back'), :focus_no @@ -98,7 +96,7 @@ HSpacing(5), VBox( VSpacing(5), - Left(Label(_('Checking SCC credentials...'))), + Left(Label(_('Checking organization credentials...'))), VSpacing(5) ), HSpacing(5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.4/src/lib/rmt/wizard_ssl_page.rb new/yast2-rmt-1.1.1/src/lib/rmt/wizard_ssl_page.rb --- old/yast2-rmt-1.0.4/src/lib/rmt/wizard_ssl_page.rb 2018-10-05 13:45:09.000000000 +0200 +++ new/yast2-rmt-1.1.1/src/lib/rmt/wizard_ssl_page.rb 2018-10-31 16:31:23.000000000 +0100 @@ -41,14 +41,14 @@ common_name = query_common_name contents = Frame( - _('SSL certificate generation'), + _('SSL Certificate Generation'), HBox( HSpacing(1), VBox( VSpacing(1), Left( HSquash( - MinWidth(30, InputField(Id(:common_name), _('Common name'), common_name)) + MinWidth(30, InputField(Id(:common_name), _('Common Name'), common_name)) ) ), VSpacing(1), @@ -68,7 +68,7 @@ ) Wizard.SetContents( - _('RMT configuration step 3/4'), + _('RMT Configuration - Step 3/5'), contents, _('<p>This step of the wizard generates the required SSL certificates.</p>'), true,
