Hello community,
here is the log from the commit of package yast2-services-manager for
openSUSE:Factory checked in at 2018-09-07 15:34:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old)
and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-services-manager"
Fri Sep 7 15:34:52 2018 rev:42 rq:633289 version:4.1.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes
2018-09-04 22:50:38.835866180 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes
2018-09-07 15:34:55.630831163 +0200
@@ -1,0 +2,14 @@
+Wed Sep 5 08:47:10 UTC 2018 - [email protected]
+
+- Bring back the ServicesManagerTargetClass#modified= method
+ (bsc#1107240).
+- 4.1.7
+
+-------------------------------------------------------------------
+Mon Aug 27 16:20:38 UTC 2018 - [email protected]
+
+- Add help for buttons in the dialog (related to bsc#1089999 and
+ fate#319428).
+- 4.1.6
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-4.1.5.tar.bz2
New:
----
yast2-services-manager-4.1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.kMh84K/_old 2018-09-07 15:34:56.078830658 +0200
+++ /var/tmp/diff_new_pack.kMh84K/_new 2018-09-07 15:34:56.078830658 +0200
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.1.5
+Version: 4.1.7
Release: 0
BuildArch: noarch
++++++ yast2-services-manager-4.1.5.tar.bz2 ->
yast2-services-manager-4.1.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/package/yast2-services-manager.changes
new/yast2-services-manager-4.1.7/package/yast2-services-manager.changes
--- old/yast2-services-manager-4.1.5/package/yast2-services-manager.changes
2018-08-23 17:50:34.000000000 +0200
+++ new/yast2-services-manager-4.1.7/package/yast2-services-manager.changes
2018-09-05 11:02:19.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Wed Sep 5 08:47:10 UTC 2018 - [email protected]
+
+- Bring back the ServicesManagerTargetClass#modified= method
+ (bsc#1107240).
+- 4.1.7
+
+-------------------------------------------------------------------
+Mon Aug 27 16:20:38 UTC 2018 - [email protected]
+
+- Add help for buttons in the dialog (related to bsc#1089999 and
+ fate#319428).
+- 4.1.6
+
+-------------------------------------------------------------------
Thu Aug 23 14:23:27 UTC 2018 - [email protected]
- Update calls to YaST2 systemd classes (related to fate#319428)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/package/yast2-services-manager.spec
new/yast2-services-manager-4.1.7/package/yast2-services-manager.spec
--- old/yast2-services-manager-4.1.5/package/yast2-services-manager.spec
2018-08-23 17:50:34.000000000 +0200
+++ new/yast2-services-manager-4.1.7/package/yast2-services-manager.spec
2018-09-05 11:02:19.000000000 +0200
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.1.5
+Version: 4.1.7
Release: 0
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/lib/services-manager/dialogs/services_manager.rb
new/yast2-services-manager-4.1.7/src/lib/services-manager/dialogs/services_manager.rb
---
old/yast2-services-manager-4.1.5/src/lib/services-manager/dialogs/services_manager.rb
2018-08-23 17:50:34.000000000 +0200
+++
new/yast2-services-manager-4.1.7/src/lib/services-manager/dialogs/services_manager.rb
2018-09-05 11:02:19.000000000 +0200
@@ -141,7 +141,11 @@
#
# @return [String]
def help
- services_table.help
+ target_selector.help +
+ "<br /><br />" +
+ services_table.help +
+ "<br /><br />" +
+ buttons_help
end
# Dialog content
@@ -177,6 +181,78 @@
)
end
+ # Help of dialog buttons
+ #
+ # @return [String]
+ def buttons_help
+ # TRANSLATORS: help section to describe the dialog buttons
+ _("<h2>Buttons description:</h2>") +
+ start_stop_button_help +
+ start_mode_button_help +
+ logs_button_help +
+ show_details_button_help +
+ apply_button_help +
+ ok_button_help +
+ "<br />" +
+ help_note
+ end
+
+ # @return [String]
+ def start_stop_button_help
+ return "" unless show_start_stop_button?
+
+ start_stop_button.help + "<br />"
+ end
+
+ # @return [String]
+ def start_mode_button_help
+ start_mode_button.help + "<br />"
+ end
+
+ # @return [String]
+ def logs_button_help
+ return "" unless show_logs_button?
+
+ logs_button.help + "<br />"
+ end
+
+ # @return [String]
+ def show_details_button_help
+ show_details_button.help + "<br />"
+ end
+
+ # @return [String]
+ def apply_button_help
+ return "" unless show_apply_button?
+
+ # TRANSLATORS: help text for the 'Apply' button
+ help = _(
+ "<b>Apply</b> saves all changes without closing the Service Manager.
This button is enabled " \
+ "only if something has been edited."
+ )
+
+ help + "<br />"
+ end
+
+ # @return [String]
+ def ok_button_help
+ # TRANSLATORS: help text for the 'OK' button
+ help = _("<b>OK</b> saves all changes and closes the Service Manager.")
+
+ help + "<br />"
+ end
+
+ # @return [String]
+ def help_note
+ if show_apply_button?
+ # TRANSLATORS: note about dialog behavior when both buttons (Apply
and OK) are available
+ _("Note: the services will not be modified until all changes are
saved by using the 'Apply' or the 'OK' button.")
+ else
+ # TRANSLATORS: note about dialog behavior when only OK button is
available
+ _("Note: the services will not be modified until all changes are
saved by using the 'OK' button.")
+ end
+ end
+
def target_selector
@target_selector ||= Widgets::TargetSelector.new(id:
WidgetsId::TARGET_SELECTOR)
end
@@ -286,7 +362,6 @@
# A popup with help is shown
def help_handler
self.finish = false
-
show_help
end
@@ -444,7 +519,7 @@
# Opens up a popup with the help text
def show_help
- Yast2::Popup.show(help, richtext: true, headline: _("Help"), buttons:
:ok)
+ Yast::Wizard.ShowHelp(help)
end
# Applies all changes indicated for each service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/logs_button.rb
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/logs_button.rb
---
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/logs_button.rb
2018-08-23 17:50:34.000000000 +0200
+++
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/logs_button.rb
2018-09-05 11:02:19.000000000 +0200
@@ -42,6 +42,14 @@
PushButton(id, label)
end
+ # Help text
+ #
+ # @return [String]
+ def help
+ # TRANSLATORS: help text for the 'Show Log' button
+ _("<b>Show Log</b> shows service logs since last booting. It opens a
new window.")
+ end
+
private
# Default widget id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/services_table.rb
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/services_table.rb
---
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/services_table.rb
2018-08-23 17:50:34.000000000 +0200
+++
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/services_table.rb
2018-09-05 11:02:19.000000000 +0200
@@ -129,6 +129,7 @@
def help
# TRANSLATORS: help text to explain the columns of the services table
_(
+ "<h2>The table contains the following information:</h2>" \
"<b>Service</b> shows the name of the service." \
"<br />" \
"<b>Start</b> shows the start mode of the service:" \
@@ -142,8 +143,7 @@
"<b>Description</b> shows the description of the service." \
"<br />" \
"<br />" \
- "Note: edited values are marked with '(*)'. These new values will be
saved by " \
- "using 'Apply' or 'OK' button."
+ "Note: edited values are marked with '(*)'."
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/show_details_button.rb
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/show_details_button.rb
---
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/show_details_button.rb
2018-08-23 17:50:34.000000000 +0200
+++
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/show_details_button.rb
2018-09-05 11:02:19.000000000 +0200
@@ -44,6 +44,14 @@
PushButton(id, label)
end
+ # Help text
+ #
+ # @return [String]
+ def help
+ # TRANSLATORS: help text for the 'Show Details' button
+ _("<b>Show Details</b> shows low level information about the service
(state, memory, cpu, etc).")
+ end
+
private
# Default widget id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/start_mode_button.rb
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/start_mode_button.rb
---
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/start_mode_button.rb
2018-08-23 17:50:34.000000000 +0200
+++
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/start_mode_button.rb
2018-09-05 11:02:19.000000000 +0200
@@ -54,6 +54,17 @@
ServicesManagerService.all_start_modes
end
+ # Help text
+ #
+ # @return [String]
+ def help
+ # TRANSLATORS: help text for the 'Start Mode' button
+ _(
+ "<b>Start Mode</b> allows to change the start mode of the service
(On Boot, On Demand or Manually). " \
+ "The possible start modes depend on the service."
+ )
+ end
+
private
# @return [String] name of the service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/start_stop_button.rb
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/start_stop_button.rb
---
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/start_stop_button.rb
2018-08-23 17:50:34.000000000 +0200
+++
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/start_stop_button.rb
2018-09-05 11:02:19.000000000 +0200
@@ -47,6 +47,18 @@
PushButton(id, label)
end
+ # Help text
+ #
+ # @return [String]
+ def help
+ # TRANSLATORS: help text for the 'Start'/'Stop' button
+ _(
+ "<b>Start</b> sets the service to be started (only shown if the
service is inactive)." \
+ "<br />" \
+ "<b>Stop</b> sets the service to be stopped (only shown if the
service is active)."
+ )
+ end
+
private
# @return [String] name of the service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/target_selector.rb
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/target_selector.rb
---
old/yast2-services-manager-4.1.5/src/lib/services-manager/widgets/target_selector.rb
2018-08-23 17:50:34.000000000 +0200
+++
new/yast2-services-manager-4.1.7/src/lib/services-manager/widgets/target_selector.rb
2018-09-05 11:02:19.000000000 +0200
@@ -34,6 +34,7 @@
# @param id [Symbol] widget id
def initialize(id: nil)
textdomain "services-manager"
+
super
end
@@ -56,6 +57,14 @@
UI.ChangeWidget(id, :Items, system_targets_items)
end
+ # Help text
+ #
+ # @return [String]
+ def help
+ # TRANSLATORS: help text for the 'Default System Target' selectbox
+ _("<b>Default System Target</b> Allows to select the Systemd default
target.")
+ end
+
private
# Default widget id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/modules/services_manager_service.rb
new/yast2-services-manager-4.1.7/src/modules/services_manager_service.rb
--- old/yast2-services-manager-4.1.5/src/modules/services_manager_service.rb
2018-08-23 17:50:34.000000000 +0200
+++ new/yast2-services-manager-4.1.7/src/modules/services_manager_service.rb
2018-09-05 11:02:19.000000000 +0200
@@ -1,4 +1,26 @@
+# encoding: utf-8
+
+# Copyright (c) [2014-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 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 LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
require "yast"
+require "yast2/systemctl"
require "yast2/system_service"
require "services-manager/service_loader"
@@ -21,6 +43,7 @@
}.freeze
# @!attribute [w] modified
+ # @note Used by AutoYaST.
# @return [Boolean] Whether the module has been modified
attr_writer :modified
@@ -273,7 +296,7 @@
# @param name [String] Service name
# @return [String] full unformatted information
def status(name)
- out = Systemctl.execute("status #{name}#{SERVICE_SUFFIX} 2>&1")
+ out = Yast2::Systemctl.execute("status #{name}#{SERVICE_SUFFIX} 2>&1")
out['stdout']
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/src/modules/services_manager_target.rb
new/yast2-services-manager-4.1.7/src/modules/services_manager_target.rb
--- old/yast2-services-manager-4.1.5/src/modules/services_manager_target.rb
2018-08-23 17:50:34.000000000 +0200
+++ new/yast2-services-manager-4.1.7/src/modules/services_manager_target.rb
2018-09-05 11:02:19.000000000 +0200
@@ -49,6 +49,11 @@
system-update
)
+ # @!attribute [w] modified
+ # @note Used by AutoYaST.
+ # @return [Boolean] Whether the module has been modified
+ attr_writer :modified
+
# Used during installation workflow
# @return [Boolean] Used by client default_target_proposal to override the
default settings
attr_accessor :force
@@ -146,7 +151,7 @@
#
# @return [Boolean]
def modified?
- default_target != initial_default_target
+ @modified || (default_target != initial_default_target)
end
alias_method :modified, :modified?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/test/dialogs/services_manager_test.rb
new/yast2-services-manager-4.1.7/test/dialogs/services_manager_test.rb
--- old/yast2-services-manager-4.1.5/test/dialogs/services_manager_test.rb
2018-08-23 17:50:34.000000000 +0200
+++ new/yast2-services-manager-4.1.7/test/dialogs/services_manager_test.rb
2018-09-05 11:02:19.000000000 +0200
@@ -356,9 +356,7 @@
let(:user_input) { [:help, :cancel] }
it "shows a popup with the help" do
- expect(Yast2::Popup).to receive(:show) do |message, options|
- expect(options[:headline]).to match(/Help/)
- end
+ expect(Yast::Wizard).to receive(:ShowHelp)
subject.run
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.5/test/services_manager_target_test.rb
new/yast2-services-manager-4.1.7/test/services_manager_target_test.rb
--- old/yast2-services-manager-4.1.5/test/services_manager_target_test.rb
2018-08-23 17:50:34.000000000 +0200
+++ new/yast2-services-manager-4.1.7/test/services_manager_target_test.rb
2018-09-05 11:02:19.000000000 +0200
@@ -153,6 +153,35 @@
end
end
+ describe "#modified=" do
+ context "when is set to true" do
+ it "sets the module as modified" do
+ subject.modified = true
+ expect(subject.modified?).to eq(true)
+ end
+ end
+
+ context "when is set to false" do
+ it "sets the module as 'not modified'" do
+ subject.modified = false
+ expect(subject.modified?).to eq(false)
+ end
+
+ context "but the default target has been changed" do
+ let(:target) { "multi-user" }
+
+ before do
+ subject.default_target = "multi-user"
+ end
+
+ it "does not set the module as 'not modified'" do
+ subject.modified = false
+ expect(subject.modified?).to eq(true)
+ end
+ end
+ end
+ end
+
describe "#changes_summary" do
context "when the default target has not been changed" do
it "returns an empty text" do
