Hello community,
here is the log from the commit of package yast2-services-manager for
openSUSE:Factory checked in at 2019-02-04 16:09:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old)
and /work/SRC/openSUSE:Factory/.yast2-services-manager.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-services-manager"
Mon Feb 4 16:09:05 2019 rev:45 rq:669867 version:4.1.12
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes
2018-12-31 09:43:52.870339857 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-services-manager.new.28833/yast2-services-manager.changes
2019-02-04 16:09:06.730021687 +0100
@@ -1,0 +2,7 @@
+Tue Jan 29 07:52:57 UTC 2019 - [email protected]
+
+- Includes the associated socket status, if applicable, as part of
+ the service details (bsc#119276)
+- 4.1.12
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-4.1.11.tar.bz2
New:
----
yast2-services-manager-4.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.2TN1xh/_old 2019-02-04 16:09:07.202021391 +0100
+++ /var/tmp/diff_new_pack.2TN1xh/_new 2019-02-04 16:09:07.202021391 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-services-manager
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.1.11
+Version: 4.1.12
Release: 0
BuildArch: noarch
++++++ yast2-services-manager-4.1.11.tar.bz2 ->
yast2-services-manager-4.1.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.11/package/yast2-services-manager.changes
new/yast2-services-manager-4.1.12/package/yast2-services-manager.changes
--- old/yast2-services-manager-4.1.11/package/yast2-services-manager.changes
2018-12-13 11:58:38.000000000 +0100
+++ new/yast2-services-manager-4.1.12/package/yast2-services-manager.changes
2019-01-29 14:29:40.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jan 29 07:52:57 UTC 2019 - [email protected]
+
+- Includes the associated socket status, if applicable, as part of
+ the service details (bsc#119276)
+- 4.1.12
+
+-------------------------------------------------------------------
Wed Dec 12 15:55:24 UTC 2018 - [email protected]
- Fix: Do not crash in chroot environment (bsc#1113732)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.11/package/yast2-services-manager.spec
new/yast2-services-manager-4.1.12/package/yast2-services-manager.spec
--- old/yast2-services-manager-4.1.11/package/yast2-services-manager.spec
2018-12-13 11:58:38.000000000 +0100
+++ new/yast2-services-manager-4.1.12/package/yast2-services-manager.spec
2019-01-29 14:29:40.000000000 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.1.11
+Version: 4.1.12
Release: 0
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.11/src/lib/services-manager/dialogs/services_manager.rb
new/yast2-services-manager-4.1.12/src/lib/services-manager/dialogs/services_manager.rb
---
old/yast2-services-manager-4.1.11/src/lib/services-manager/dialogs/services_manager.rb
2018-12-13 11:58:38.000000000 +0100
+++
new/yast2-services-manager-4.1.12/src/lib/services-manager/dialogs/services_manager.rb
2019-01-29 14:29:40.000000000 +0100
@@ -464,13 +464,13 @@
def show_details_button_handler
self.finish = false
- service = selected_service_name
+ service = selected_service
full_info = ServicesManagerService.status(service)
- x_size = full_info.lines.collect{|line| line.size}.sort.last
+ x_size = full_info.lines.map(&:size).sort.last
y_size = full_info.lines.count
Popup.LongText(
- format(_("Service %{service} Full Info"), service: service),
+ format(_("Service %{service} Full Info"), service: service.name),
RichText("<pre>#{full_info}</pre>"),
# counted size plus dialog spacing
x_size + 8,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.11/src/modules/services_manager_service.rb
new/yast2-services-manager-4.1.12/src/modules/services_manager_service.rb
--- old/yast2-services-manager-4.1.11/src/modules/services_manager_service.rb
2018-12-13 11:58:38.000000000 +0100
+++ new/yast2-services-manager-4.1.12/src/modules/services_manager_service.rb
2019-01-29 14:29:40.000000000 +0100
@@ -34,8 +34,6 @@
include Yast::Logger
extend Yast::I18n
- SERVICE_SUFFIX = '.service'
-
START_MODE = {
on_boot: N_('On Boot'),
on_demand: N_('On Demand'),
@@ -291,13 +289,18 @@
exists?(name, &:start_modes)
end
- # Returns full information about the service as returned from systemctl
command
+ # Returns full information from systemctl command about the service status
+ #
+ # @param service [Yast2::SystemService]
#
- # @param name [String] Service name
# @return [String] full unformatted information
- def status(name)
- out = Yast2::Systemctl.execute("status #{name}#{SERVICE_SUFFIX} 2>&1")
- out['stdout']
+ def status(service)
+ output = service.keywords.map do |keyword|
+ cmd = Yast2::Systemctl.execute("status #{keyword} 2>&1")
+ cmd["stdout"]
+ end
+
+ output.join("\n")
end
# Translates the start mode for a given service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-4.1.11/test/services_manager_service_test.rb
new/yast2-services-manager-4.1.12/test/services_manager_service_test.rb
--- old/yast2-services-manager-4.1.11/test/services_manager_service_test.rb
2018-12-13 11:58:38.000000000 +0100
+++ new/yast2-services-manager-4.1.12/test/services_manager_service_test.rb
2019-01-29 14:29:40.000000000 +0100
@@ -32,14 +32,16 @@
instance_double(
Yast2::SystemService, name: "cups", description: "CUPS", start: true,
stop: true,
state: "active", substate: "running", changed?: false, start_mode:
:on_boot,
- save: nil, refresh: nil, errors: {}, found?: true, action: nil
+ save: nil, refresh: nil, errors: {}, found?: true, action: nil,
+ keywords: ["cups.service", "cups.socket"]
)
end
let(:dbus) do
instance_double(
Yast2::SystemService, name: "dbus", changed?: true, start_mode: nil,
active?: true,
- running?: true, refresh: nil, save: nil, errors: {}, found?: true,
action: nil
+ running?: true, refresh: nil, save: nil, errors: {}, found?: true,
action: nil,
+ keywords: ["dbus.service"]
)
end
@@ -563,6 +565,21 @@
end
end
+ describe "#status" do
+ let(:fake_cmd_result) { { "stdout" => "Fake status output" } }
+
+ before do
+ allow(Yast2::Systemctl).to
receive(:execute).with(/status/).and_return(fake_cmd_result)
+ end
+
+ it "queries for the status of each service keyword" do
+ expect(Yast2::Systemctl).to receive(:execute).with(/status
cups\.service/)
+ expect(Yast2::Systemctl).to receive(:execute).with(/status cups\.socket/)
+
+ subject.status(cups)
+ end
+ end
+
describe "#switch" do
let(:active?) { true }
