Hello community, here is the log from the commit of package yast2-rmt for openSUSE:Factory checked in at 2018-10-15 09:41:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-rmt (Old) and /work/SRC/openSUSE:Factory/.yast2-rmt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-rmt" Mon Oct 15 09:41:43 2018 rev:9 rq:641673 version:1.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-rmt/yast2-rmt.changes 2018-08-28 09:24:37.996863372 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-rmt.new/yast2-rmt.changes 2018-10-15 09:42:48.867408597 +0200 @@ -1,0 +2,6 @@ +Wed Oct 3 14:21:13 UTC 2018 - [email protected] + +- version 1.0.4 +- Adapt to the new YaST2 systemd API (bsc#1107253) + +------------------------------------------------------------------- @@ -6,0 +13 @@ +- Fix visual issues with text alignment Old: ---- yast2-rmt-1.0.3.tar.bz2 New: ---- yast2-rmt-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-rmt.spec ++++++ --- /var/tmp/diff_new_pack.DJMTlY/_old 2018-10-15 09:42:49.583407942 +0200 +++ /var/tmp/diff_new_pack.DJMTlY/_new 2018-10-15 09:42:49.587407938 +0200 @@ -17,7 +17,7 @@ Name: yast2-rmt -Version: 1.0.3 +Version: 1.0.4 Release: 0 BuildArch: noarch ++++++ yast2-rmt-1.0.3.tar.bz2 -> yast2-rmt-1.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/Dockerfile new/yast2-rmt-1.0.4/Dockerfile --- old/yast2-rmt-1.0.3/Dockerfile 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/Dockerfile 2018-10-05 13:45:09.000000000 +0200 @@ -1,4 +1,4 @@ -FROM yastdevel/ruby +FROM yastdevel/ruby:sle15 RUN gem install --no-rdoc --no-ri scc-codestyle -v 0.1.4 RUN rm /etc/alternatives/rubocop && ln -s /usr/lib64/ruby/gems/2.5.0/gems/rubocop-0.52.1/bin/rubocop /etc/alternatives/rubocop COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/PACKAGE.md new/yast2-rmt-1.0.4/PACKAGE.md --- old/yast2-rmt-1.0.3/PACKAGE.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-rmt-1.0.4/PACKAGE.md 2018-10-05 13:45:09.000000000 +0200 @@ -0,0 +1,79 @@ +## yast2-rmt Packaging + +### Creating the tarball for packaging + +To create the tarball for testing or packaing run: + +``` +rake package +``` + +### Package + +The package gets built for SLE 15 and openSUSE Leap 15 here: +https://build.opensuse.org/package/show/systemsmanagement:SCC:RMT/yast2-rmt + +You can use: + +```bash +rake osc:commit +``` + +to commit the current version to OBS. + + +#### Submit Requests to openSUSE Factory and SLES + +To get a maintenance request accepted, each changelog entry needs to have at +least one reference to a bug or feature request like `bsc#123` or `fate#123`. + +Note: If you want to disable automatic changes made by osc (e.g. License string) + use the `--no-cleanup` switch. Can be used with commands like `osc mr`, `osc sr` + and `osc ci`. + +##### Factory First + +To submit a request to openSUSE Factory, issue this commands in the console: + +```bash +osc sr systemsmanagement:SCC:RMT yast2-rmt openSUSE:Factory +``` + +##### Submit maintenance updates for SLES to the Internal Build Service + +###### Get target codesteams where to submit + +To checkout in which codestreams the package is currently maintaned, 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) + +###### Submit updates + +For each maintained codestream you need to create a new maintenance request: + +```bash +osc -A https://api.suse.de mr Devel:SCC:RMT yast2-rmt SUSE:SLE-15:Update +``` + +Note: In case the `mr` (maintenance request) command is not working properly, + try `sr` (submit request) command. + + +Example: + +```bash +$ osc -A https://api.suse.de maintained yast2-rmt +SUSE:SLE-15:Update/yast2-rmt + +$ osc -A https://api.suse.de mr Devel:SCC:RMT yast2-rmt SUSE:SLE-15:Update +Using target project 'SUSE:Maintenance' +1736456 +``` + +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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/README.md new/yast2-rmt-1.0.4/README.md --- old/yast2-rmt-1.0.3/README.md 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/README.md 2018-10-05 13:45:09.000000000 +0200 @@ -29,51 +29,3 @@ docker build -t yast-rmt-image . docker run -it yast-rmt-image rspec ``` - -### Creating the tarball for packaging - -To create the tarball for testing or packaing run: - -``` -rake package -``` - -### Package - -The package gets built for SLE 15 and openSUSE Leap 15 here: -https://build.opensuse.org/package/show/systemsmanagement:SCC:RMT/yast2-rmt - -You can use: - -```bash -rake osc:commit -``` - -to commit the current version to OBS. - - -#### Submit Requests to openSUSE Factory and SLES - -To get a maintenance request accepted, each changelog entry needs to reference a bug or feature -request with `bsc#123` or `fate#123`. - -##### Factory First - -To submit a request to openSUSE Factory, issue this commands in the console: - -```bash -osc sr systemsmanagement:SCC:RMT yast2-rmt openSUSE:Factory --no-cleanup -``` - - -##### Internal Build Service - -To submit the updated package as a maintenance update to released SLES versions: - -```bash -osc -A https://api.suse.de mr Devel:SCC:RMT yast2-rmt SUSE:SLE-15:Update --no-cleanup -``` - -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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/package/yast2-rmt.changes new/yast2-rmt-1.0.4/package/yast2-rmt.changes --- old/yast2-rmt-1.0.3/package/yast2-rmt.changes 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/package/yast2-rmt.changes 2018-10-05 13:45:09.000000000 +0200 @@ -1,9 +1,16 @@ ------------------------------------------------------------------- +Wed Oct 3 14:21:13 UTC 2018 - [email protected] + +- version 1.0.4 +- Adapt to the new YaST2 systemd API (bsc#1107253) + +------------------------------------------------------------------- Tue Aug 14 10:55:02 UTC 2018 - [email protected] - version 1.0.3 - Change configuration file path to new location (rmt-server >= 1.0.6) - Hide database password in summary (bsc#1102053) +- Fix visual issues with text alignment ------------------------------------------------------------------- Thu Jul 5 08:52:44 UTC 2018 - [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/package/yast2-rmt.spec new/yast2-rmt-1.0.4/package/yast2-rmt.spec --- old/yast2-rmt-1.0.3/package/yast2-rmt.spec 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/package/yast2-rmt.spec 2018-10-05 13:45:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-rmt -Version: 1.0.3 +Version: 1.0.4 Release: 0 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/spec/rmt/wizard_maria_db_page_spec.rb new/yast2-rmt-1.0.4/spec/rmt/wizard_maria_db_page_spec.rb --- old/yast2-rmt-1.0.3/spec/rmt/wizard_maria_db_page_spec.rb 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/spec/rmt/wizard_maria_db_page_spec.rb 2018-10-05 13:45:09.000000000 +0200 @@ -163,15 +163,18 @@ end describe '#start_database' do - # rubocop:disable RSpec/VerifiedDoubles - # Yast::SystemdService is missing the required methods a regular class would have that are required for verifying doubles to work - let(:service_double) { double('Yast::SystemdService') } + let(:service_double) do + klass = defined?(Yast2::Systemd::Service) ? Yast2::Systemd::Service : Yast::SystemdServiceClass::Service + instance_double(klass) + end - # rubocop:enable RSpec/VerifiedDoubles + let(:service_api) do + defined?(Yast2::Systemd::Service) ? Yast2::Systemd::Service : Yast::SystemdService + end before do expect(Yast::UI).to receive(:OpenDialog) - expect(Yast::SystemdService).to receive(:find!).with('mysql').and_return(service_double) + expect(service_api).to receive(:find!).with('mysql').and_return(service_double) expect(service_double).to receive(:running?).and_return(false) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/src/lib/rmt/maria_db/new_root_password_dialog.rb new/yast2-rmt-1.0.4/src/lib/rmt/maria_db/new_root_password_dialog.rb --- old/yast2-rmt-1.0.3/src/lib/rmt/maria_db/new_root_password_dialog.rb 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/src/lib/rmt/maria_db/new_root_password_dialog.rb 2018-10-05 13:45:09.000000000 +0200 @@ -28,7 +28,7 @@ super @dialog_heading = N_('Setting database root password') - @dialog_label = N_('The current MariaDB root password is empty.\nSetting a root password is required for security reasons.') + @dialog_label = N_('The current MariaDB root password is empty. Setting a root password is required for security reasons.') @password_field_label = N_('New MariaDB root &Password') end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/src/lib/rmt/wizard.rb new/yast2-rmt-1.0.4/src/lib/rmt/wizard.rb --- old/yast2-rmt-1.0.3/src/lib/rmt/wizard.rb 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/src/lib/rmt/wizard.rb 2018-10-05 13:45:09.000000000 +0200 @@ -35,7 +35,6 @@ Yast.import 'Sequencer' Yast.import 'Report' Yast.import 'String' - Yast.import 'SystemdService' Yast.import 'Confirm' textdomain 'rmt' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/src/lib/rmt/wizard_final_page.rb new/yast2-rmt-1.0.4/src/lib/rmt/wizard_final_page.rb --- old/yast2-rmt-1.0.3/src/lib/rmt/wizard_final_page.rb 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/src/lib/rmt/wizard_final_page.rb 2018-10-05 13:45:09.000000000 +0200 @@ -51,10 +51,8 @@ Left(Heading(_('SSL certificate path:'))), Left(Label(RMT::SSL::CertificateGenerator::RMT_SSL_DIR.to_s)), VSpacing(1), - Left(Heading(_('Database credentials:'))), - Left(HBox(HSpacing(1), - VBox(HBox(Label(_('Username:')), Label(@config['database']['username'])), - HBox(Label(_('Password:')), Label('***************'))))), + 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)'))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rmt-1.0.3/src/lib/rmt/wizard_maria_db_page.rb new/yast2-rmt-1.0.4/src/lib/rmt/wizard_maria_db_page.rb --- old/yast2-rmt-1.0.3/src/lib/rmt/wizard_maria_db_page.rb 2018-08-22 15:23:28.000000000 +0200 +++ new/yast2-rmt-1.0.4/src/lib/rmt/wizard_maria_db_page.rb 2018-10-05 13:45:09.000000000 +0200 @@ -21,6 +21,14 @@ require 'rmt/execute' require 'ui/event_dispatcher' +# In yast2 4.1.3 a reorganization of the YaST systemd library was introduced. When running on an +# older version, just fall back to the old SystemdService module (bsc#1107253). +begin + require 'yast2/systemd/service' +rescue LoadError + Yast.import 'SystemdService' +end + module RMT; end class RMT::WizardMariaDBPage < Yast::Client @@ -147,7 +155,7 @@ HSpacing(5) ) ) - service = Yast::SystemdService.find!('mysql') + service = find_service('mysql') is_running = service.running? ? true : service.start unless is_running @@ -192,4 +200,17 @@ true end + + private + + # Returns the Systemd service + # + # @note This method falls back to Yast::SystemdService if the new API (Yast2::Systemd::Service) + # is not defined. + # @param name [String] Service's name + # @return [Yast2::Systemd::Service,Yast::SystemdServiceClass::Service] + def find_service(name) + service_api = defined?(Yast2::Systemd::Service) ? Yast2::Systemd::Service : Yast::SystemdService + service_api.find!(name) + end end
