Hello community,
here is the log from the commit of package yast2-services-manager for
openSUSE:Factory checked in at 2014-07-23 22:05:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-07-18 14:03:21.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes
2014-07-23 22:05:40.000000000 +0200
@@ -1,0 +2,27 @@
+Tue Jul 22 15:01:52 CEST 2014 - loci...@suse.com
+
+- Using new library ServicesProposal, that holds information about
+ enabled/disabled services during installation, for exporting the
+ services configuration for AutoYast at the end of installation
+ (bnc#887688)
+- 3.1.24
+
+-------------------------------------------------------------------
+Tue Jul 22 08:57:04 CEST 2014 - loci...@suse.com
+
+- Services Manager client for AutoYast marked as clonable (meaning:
+ can read the current system state) (bnc#887115)
+- 3.1.23
+
+-------------------------------------------------------------------
+Thu Jul 17 15:12:50 CEST 2014 - loci...@suse.com
+
+- Fixed AutoYast summary to show both enabled and disabled services
+- Fixed reading targets - now they read in all cases except the
+ initial installation where systemctl doesn't work in chroot
+- Fixed AutoYast schema to allow service or listentry as AutoYast
+ by default exports all single entries as 'listentry'
+- All bnc#887695 and bnc#887115
+- 3.1.22
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-3.1.21.tar.bz2
New:
----
yast2-services-manager-3.1.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.RWyAMz/_old 2014-07-23 22:05:41.000000000 +0200
+++ /var/tmp/diff_new_pack.RWyAMz/_new 2014-07-23 22:05:41.000000000 +0200
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.21
+Version: 3.1.24
Release: 0
BuildArch: noarch
@@ -33,7 +33,8 @@
Source0: %{name}-%{version}.tar.bz2
Requires: ruby
-Requires: yast2 >= 3.1.82
+# ServicesManager library
+Requires: yast2 >= 3.1.86
Requires: yast2-ruby-bindings >= 1.2.0
# need new enough installation for its inst clients
Conflicts: yast2-installation < 3.1.32
@@ -43,8 +44,9 @@
BuildRequires: ruby
BuildRequires: update-desktop-files
-BuildRequires: yast2 >= 3.1.82
BuildRequires: yast2-ruby-bindings >= 1.2.0
+# ServicesManager library
+BuildRequires: yast2 >= 3.1.86
# Support for 'data' directory in rake install task
BuildRequires: rubygem-rspec
BuildRequires: rubygem-yast-rake >= 0.1.7
++++++ yast2-services-manager-3.1.21.tar.bz2 ->
yast2-services-manager-3.1.24.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/package/yast2-services-manager.changes
new/yast2-services-manager-3.1.24/package/yast2-services-manager.changes
--- old/yast2-services-manager-3.1.21/package/yast2-services-manager.changes
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/package/yast2-services-manager.changes
2014-07-22 15:22:07.000000000 +0200
@@ -1,4 +1,31 @@
-------------------------------------------------------------------
+Tue Jul 22 15:01:52 CEST 2014 - loci...@suse.com
+
+- Using new library ServicesProposal, that holds information about
+ enabled/disabled services during installation, for exporting the
+ services configuration for AutoYast at the end of installation
+ (bnc#887688)
+- 3.1.24
+
+-------------------------------------------------------------------
+Tue Jul 22 08:57:04 CEST 2014 - loci...@suse.com
+
+- Services Manager client for AutoYast marked as clonable (meaning:
+ can read the current system state) (bnc#887115)
+- 3.1.23
+
+-------------------------------------------------------------------
+Thu Jul 17 15:12:50 CEST 2014 - loci...@suse.com
+
+- Fixed AutoYast summary to show both enabled and disabled services
+- Fixed reading targets - now they read in all cases except the
+ initial installation where systemctl doesn't work in chroot
+- Fixed AutoYast schema to allow service or listentry as AutoYast
+ by default exports all single entries as 'listentry'
+- All bnc#887695 and bnc#887115
+- 3.1.22
+
+-------------------------------------------------------------------
Mon Jul 14 10:20:39 CEST 2014 - loci...@suse.com
- ServicesManagerServiceClass and ServicesManagerTargetClass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/package/yast2-services-manager.spec
new/yast2-services-manager-3.1.24/package/yast2-services-manager.spec
--- old/yast2-services-manager-3.1.21/package/yast2-services-manager.spec
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/package/yast2-services-manager.spec
2014-07-22 15:22:07.000000000 +0200
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.21
+Version: 3.1.24
Release: 0
BuildArch: noarch
@@ -33,7 +33,8 @@
Source0: %{name}-%{version}.tar.bz2
Requires: ruby
-Requires: yast2 >= 3.1.82
+# ServicesManager library
+Requires: yast2 >= 3.1.86
Requires: yast2-ruby-bindings >= 1.2.0
# need new enough installation for its inst clients
Conflicts: yast2-installation < 3.1.32
@@ -44,7 +45,8 @@
BuildRequires: ruby
BuildRequires: update-desktop-files
BuildRequires: yast2-ruby-bindings >= 1.2.0
-BuildRequires: yast2 >= 3.1.82
+# ServicesManager library
+BuildRequires: yast2 >= 3.1.86
# Support for 'data' directory in rake install task
BuildRequires: rubygem-yast-rake >= 0.1.7
BuildRequires: rubygem-rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/src/autoyast_rnc/services-manager.rnc
new/yast2-services-manager-3.1.24/src/autoyast_rnc/services-manager.rnc
--- old/yast2-services-manager-3.1.21/src/autoyast_rnc/services-manager.rnc
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/src/autoyast_rnc/services-manager.rnc
2014-07-22 15:22:07.000000000 +0200
@@ -30,7 +30,8 @@
# current services-manager schema
-service = element service { text }
+# by default, AutoYast exports list entries as 'listentry'
+service = element service { text } | element listentry { text }
enabled =
element enabled {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/src/data/services-manager/autoyast_summary.erb
new/yast2-services-manager-3.1.24/src/data/services-manager/autoyast_summary.erb
---
old/yast2-services-manager-3.1.21/src/data/services-manager/autoyast_summary.erb
2014-07-14 15:17:29.000000000 +0200
+++
new/yast2-services-manager-3.1.24/src/data/services-manager/autoyast_summary.erb
2014-07-22 15:22:07.000000000 +0200
@@ -4,11 +4,25 @@
<h2><%= _('Services Manager') %></h2>
<p><b><%= _('Default Target') %></b></p>
-<p><%= ERB::Util.html_escape(ServicesManagerTarget.export) %></p>
+<ul><li><%= ERB::Util.html_escape(
+ ServicesManagerTargetClass::BaseTargets.localize(
+ ServicesManagerTarget.export
+ )
+) %></li></ul>
-<p><b><%= _('Enabled Services') %></b></p>
+<% services = ServicesManagerService.export %>
+
+<h2><%= _('Services') %></h2>
+<p><b><%= _('Enabled') %></b></p>
+<ul>
+<% services.fetch("enable", []).each do |service| %>
+ <li><%= ERB::Util.html_escape(service) %></li>
+<% end %>
+</ul>
+
+<p><b><%= _('Disabled') %></b></p>
<ul>
-<% ServicesManagerService.export.each do |service| %>
+<% services.fetch("disable", []).each do |service| %>
<li><%= ERB::Util.html_escape(service) %></li>
<% end %>
</ul>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/src/desktop/services-manager.desktop
new/yast2-services-manager-3.1.24/src/desktop/services-manager.desktop
--- old/yast2-services-manager-3.1.21/src/desktop/services-manager.desktop
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/src/desktop/services-manager.desktop
2014-07-22 15:22:07.000000000 +0200
@@ -13,6 +13,7 @@
X-SuSE-YaST-AutoInst=all
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstClonable=true
Icon=yast-runlevel
Exec=xdg-su -c "/sbin/yast2 services-manager"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/src/modules/services_manager_service.rb
new/yast2-services-manager-3.1.24/src/modules/services_manager_service.rb
--- old/yast2-services-manager-3.1.21/src/modules/services_manager_service.rb
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/src/modules/services_manager_service.rb
2014-07-22 15:22:07.000000000 +0200
@@ -2,7 +2,7 @@
module Yast
import "Service"
- import "Mode"
+ import "ServicesProposal"
class ServicesManagerServiceClass < Module
include Yast::Logger
@@ -245,11 +245,14 @@
!enabled(service_name) && properties[:modified]
end
- log.info "Export: enabled services: #{enabled_services.keys}, disabled
services: #{disabled_services.keys}"
+ export_enable = enabled_services.keys | ServicesProposal.enabled_services
+ export_disable = disabled_services.keys |
ServicesProposal.disabled_services
+
+ log.info "Export: enabled services: #{export_enable}, disabled services:
#{export_disable}"
{
- 'enable' => enabled_services.keys,
- 'disable' => disabled_services.keys,
+ 'enable' => export_enable,
+ 'disable' => export_disable,
}
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/src/modules/services_manager_target.rb
new/yast2-services-manager-3.1.24/src/modules/services_manager_target.rb
--- old/yast2-services-manager-3.1.21/src/modules/services_manager_target.rb
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/src/modules/services_manager_target.rb
2014-07-22 15:22:07.000000000 +0200
@@ -1,7 +1,7 @@
require "yast"
module Yast
- import 'Mode'
+ import 'Stage'
import 'SystemdTarget'
class ServicesManagerTargetClass < Module
@@ -79,7 +79,7 @@
@default_target = ''
# Reads the data on a running system only
- return true unless Mode.normal
+ return true if Stage.initial
default_target = SystemdTarget.get_default
@default_target = default_target ? default_target.name : ''
@@ -100,7 +100,7 @@
end
def default_target= new_default
- if Mode.normal && !targets.keys.include?(new_default)
+ if !Stage.initial && !targets.keys.include?(new_default)
raise "Target #{new_default} not found, available only
#{targets.keys.join(', ')}"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/test/services_manager_target_test.rb
new/yast2-services-manager-3.1.24/test/services_manager_target_test.rb
--- old/yast2-services-manager-3.1.21/test/services_manager_target_test.rb
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/test/services_manager_target_test.rb
2014-07-22 15:22:07.000000000 +0200
@@ -43,14 +43,13 @@
expect(target.targets.keys).not_to include('sleep')
end
- it "skips reading targets if Mode.normal is false" do
- allow(Yast::Mode).to receive(:mode).and_return("instalation")
+ it "skips reading targets if `Stage` is `initial`" do
+ allow(Yast::Stage).to receive(:stage).and_return("initial")
expect(SystemdTarget).not_to receive(:all)
expect(SystemdTarget).not_to receive(:get_default)
target = ServicesManagerTargetClass.new
expect(target.targets).to be_empty
expect(target.default_target).to be_empty
- Mode.SetMode('normal')
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.21/test/services_manager_test.rb
new/yast2-services-manager-3.1.24/test/services_manager_test.rb
--- old/yast2-services-manager-3.1.21/test/services_manager_test.rb
2014-07-14 15:17:29.000000000 +0200
+++ new/yast2-services-manager-3.1.24/test/services_manager_test.rb
2014-07-22 15:22:07.000000000 +0200
@@ -40,13 +40,17 @@
'e' => { :enabled => true, :loaded => false },
}
+ # Services set during installation
+ ServicesProposal.enable_service('aaa')
+ ServicesProposal.disable_service('bbb')
+
allow(ServicesManagerService).to
receive(:services).and_return(services)
expect(ServicesManagerTarget).to
receive(:default_target).and_return('some_target')
data = Yast::ServicesManager.export
expect(data['default_target']).to eq('some_target')
- expect(data['services']['enable'].sort).to eq(['a', 'c'].sort)
- expect(data['services']['disable'].sort).to eq(['b'].sort)
+ expect(data['services']['enable'].sort).to eq(['a', 'c', 'aaa'].sort)
+ expect(data['services']['disable'].sort).to eq(['b', 'bbb'].sort)
end
context "when using AutoYast profile written in SLE 11 format" do
@@ -118,10 +122,13 @@
it "returns HTML-formatted autoyast summary with HTML-escaped values" do
expect(ServicesManagerTarget).to
receive(:export).and_return("multi-head-graphical-hydra")
- expect(ServicesManagerService).to
receive(:export).and_return(["service-1", "service-<br>-2",
"service-<b>name</b>-3"])
+ expect(ServicesManagerService).to receive(:export).and_return({
+ "enable" => ["service-1", "service-<br>-2", "service-<b>name</b>-3"],
+ "disable" => ["service-4", "service-<br>-5",
"service-<b>name</b>-6"],
+ })
summary = ServicesManager.auto_summary
- ["multi-head-graphical-hydra", "service-1", "service-<br>-2",
"service-<b>name</b>-3"].each do |item|
+ ["multi-head-graphical-hydra", "service-[14]",
"service-<br>-[25]", "service-<b>name</b>-[36]"].each do
|item|
expect(summary).to match(/#{item}/)
end
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
