Hello community,
here is the log from the commit of package yast2-services-manager for
openSUSE:Factory checked in at 2017-02-18 03:15:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old)
and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-services-manager"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes
2017-02-03 20:07:54.222746105 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes
2017-02-18 03:15:30.334803885 +0100
@@ -1,0 +2,7 @@
+Mon Feb 13 14:34:34 CET 2017 - [email protected]
+
+- AutoYaST: "Write" can be called in first and second installation
+ stage (FATE#321738).
+- 3.2.1
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-3.2.0.tar.bz2
New:
----
yast2-services-manager-3.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.CID4Z2/_old 2017-02-18 03:15:30.794738927 +0100
+++ /var/tmp/diff_new_pack.CID4Z2/_new 2017-02-18 03:15:30.798738362 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.2.0
+Version: 3.2.1
Release: 0
BuildArch: noarch
@@ -82,7 +82,9 @@
%{yast_dir}/modules/*.rb
%{yast_dir}/schema/autoyast/rnc/*.rnc
%dir %{yast_dir}/lib/services-manager/
+%dir %{yast_dir}/lib/services-manager/clients
%{yast_dir}/lib/services-manager/*.rb
+%{yast_dir}/lib/services-manager/clients/*.rb
%dir %{yast_dir}/data/services-manager/
%{yast_dir}/data/services-manager/*.erb
%{_prefix}/share/applications/YaST2/services-manager.desktop
++++++ yast2-services-manager-3.2.0.tar.bz2 ->
yast2-services-manager-3.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.2.0/package/yast2-services-manager.changes
new/yast2-services-manager-3.2.1/package/yast2-services-manager.changes
--- old/yast2-services-manager-3.2.0/package/yast2-services-manager.changes
2017-01-24 16:50:48.476673328 +0100
+++ new/yast2-services-manager-3.2.1/package/yast2-services-manager.changes
2017-02-15 16:54:21.361183717 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Feb 13 14:34:34 CET 2017 - [email protected]
+
+- AutoYaST: "Write" can be called in first and second installation
+ stage (FATE#321738).
+- 3.2.1
+
+-------------------------------------------------------------------
Thu Jan 19 17:10:47 CET 2017 - [email protected]
- Using systemctl calls (is-active, is-enabled) to evaluate if the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.2.0/package/yast2-services-manager.spec
new/yast2-services-manager-3.2.1/package/yast2-services-manager.spec
--- old/yast2-services-manager-3.2.0/package/yast2-services-manager.spec
2017-01-24 16:50:48.480673328 +0100
+++ new/yast2-services-manager-3.2.1/package/yast2-services-manager.spec
2017-02-15 16:54:21.361183717 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.2.0
+Version: 3.2.1
Release: 0
BuildArch: noarch
@@ -82,7 +82,9 @@
%{yast_dir}/modules/*.rb
%{yast_dir}/schema/autoyast/rnc/*.rnc
%dir %{yast_dir}/lib/services-manager/
+%dir %{yast_dir}/lib/services-manager/clients
%{yast_dir}/lib/services-manager/*.rb
+%{yast_dir}/lib/services-manager/clients/*.rb
%dir %{yast_dir}/data/services-manager/
%{yast_dir}/data/services-manager/*.erb
%{_prefix}/share/applications/YaST2/services-manager.desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.2.0/src/clients/services-manager_finish.rb
new/yast2-services-manager-3.2.1/src/clients/services-manager_finish.rb
--- old/yast2-services-manager-3.2.0/src/clients/services-manager_finish.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-services-manager-3.2.1/src/clients/services-manager_finish.rb
2017-02-15 16:54:21.377183717 +0100
@@ -0,0 +1,3 @@
+require "services-manager/clients/services-manager_finish.rb"
+
+::ServicesManager::Clients::ServicesManagerFinish.run
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.2.0/src/lib/services-manager/clients/services-manager_finish.rb
new/yast2-services-manager-3.2.1/src/lib/services-manager/clients/services-manager_finish.rb
---
old/yast2-services-manager-3.2.0/src/lib/services-manager/clients/services-manager_finish.rb
1970-01-01 01:00:00.000000000 +0100
+++
new/yast2-services-manager-3.2.1/src/lib/services-manager/clients/services-manager_finish.rb
2017-02-15 16:54:21.377183717 +0100
@@ -0,0 +1,20 @@
+require "installation/finish_client"
+
+module ServicesManager
+ module Clients
+ Yast.import "ServicesManagerTarget"
+ Yast.import "ServicesManagerService"
+
+ class ServicesManagerFinish < ::Installation::FinishClient
+ def title
+ textdomain "installation"
+ _("Setting default target and system services ...")
+ end
+
+ def write
+ ServicesManagerTarget.save
+ ServicesManagerService.save
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.2.0/src/modules/services_manager_service.rb
new/yast2-services-manager-3.2.1/src/modules/services_manager_service.rb
--- old/yast2-services-manager-3.2.0/src/modules/services_manager_service.rb
2017-01-24 16:50:48.544673328 +0100
+++ new/yast2-services-manager-3.2.1/src/modules/services_manager_service.rb
2017-02-15 16:54:21.381183717 +0100
@@ -4,6 +4,7 @@
import "Service"
import "ServicesProposal"
import "SystemdService"
+ import "Stage"
class ServicesManagerServiceClass < Module
include Yast::Logger
@@ -338,12 +339,15 @@
return false
end
- # Then try to adjust services run (active/inactive)
- # Might start or stop some services that would cause system instability
- switch_services
- if !errors.empty?
- Builtins.y2error "There were some errors during saving: " +
errors.join(', ')
- return false
+ unless Stage.initial
+ # Then try to adjust services run (active/inactive)
+ # Might start or stop some services that would cause system instability
+ # This makes only sense in an installed system (not inst-sys)
+ switch_services
+ if !errors.empty?
+ Builtins.y2error "There were some errors during saving: " +
errors.join(', ')
+ return false
+ end
end
modified_services.keys.each { |service_name| reset_service(service_name)
}
@@ -409,6 +413,12 @@
# @params [String] service name
# @return [Boolean]
def exists?(service)
+ if Stage.initial && !services[service]
+ # We are in inst-sys. So we cannot check for installed services but
generate entries
+ # for these services if they still not exists.
+ services[service] = DEFAULT_SERVICE_SETTINGS.clone
+ end
+
exists = !!services[service]
if exists && block_given?
yield
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.2.0/test/services-manager_finish_test.rb
new/yast2-services-manager-3.2.1/test/services-manager_finish_test.rb
--- old/yast2-services-manager-3.2.0/test/services-manager_finish_test.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-services-manager-3.2.1/test/services-manager_finish_test.rb
2017-02-15 16:54:21.385183717 +0100
@@ -0,0 +1,22 @@
+#! /usr/bin/env rspec
+
+require_relative "./test_helper"
+
+require "services-manager/clients/services-manager_finish.rb"
+
+describe ::ServicesManager::Clients::ServicesManagerFinish do
+ describe "#title" do
+ it "returns string with title" do
+ expect(subject.title).to be_a ::String
+ end
+ end
+
+ describe "#write" do
+ it "writes installation services and default target" do
+ expect(::Yast::ServicesManagerTarget).to receive(:save)
+ expect(::Yast::ServicesManagerService).to receive(:save)
+
+ subject.write
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.2.0/test/services_manager_service_test.rb
new/yast2-services-manager-3.2.1/test/services_manager_service_test.rb
--- old/yast2-services-manager-3.2.0/test/services_manager_service_test.rb
2017-01-24 16:50:48.564673328 +0100
+++ new/yast2-services-manager-3.2.1/test/services_manager_service_test.rb
2017-02-15 16:54:21.389183717 +0100
@@ -196,5 +196,24 @@
expect(zbus_service[:active]).to eq(true)
end
end
+
+ context "when running in installation-system" do
+ it "do not switch a service at all" do
+ stub_services
+ postfix = service.all['postfix']
+ status = postfix[:active]
+ service.switch 'postfix' # locally only
+ allow(Stage).to receive(:initial).and_return true
+ expect(subject).to_not receive(:switch_services)
+ service.save
+ end
+ it "generates missing services entries" do
+ stub_services
+ allow(Stage).to receive(:initial).and_return true
+ service.enable("new_service")
+ expect(service.services["new_service"]).not_to be_nil
+ end
+ end
+
end
end
