Hello community,
here is the log from the commit of package yast2-services-manager for
openSUSE:Factory checked in at 2014-06-17 11:22:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-13 20:45:41.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes
2014-06-17 11:22:56.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Jun 6 10:52:11 CEST 2014 - [email protected]
+
+- AutoYast summary - hard-coded ERB moved to separate file
+ to be able to generate translations (bnc#878606)
+- Added missing textdomain (bnc#881277)
+- 3.1.14
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-3.1.13.tar.bz2
New:
----
yast2-services-manager-3.1.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.FScTdH/_old 2014-06-17 11:22:57.000000000 +0200
+++ /var/tmp/diff_new_pack.FScTdH/_new 2014-06-17 11:22:57.000000000 +0200
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.13
+Version: 3.1.14
Release: 0
BuildArch: noarch
@@ -45,9 +45,9 @@
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 3.0.5
BuildRequires: yast2-ruby-bindings >= 1.2.0
-# need install task
+# Support for 'data' directory in rake install task
BuildRequires: rubygem-rspec
-BuildRequires: rubygem-yast-rake >= 0.1.6
+BuildRequires: rubygem-yast-rake >= 0.1.7
Summary: YaST2 - Services Manager
License: GPL-2.0+
@@ -66,7 +66,7 @@
%check
# opensuse-13.1 does not contain rspec in default repositories
%if 0%{?suse_version} > 1310
-rspec test/*_test.rb
+rake test:unit
%endif
%install
@@ -80,9 +80,10 @@
%{yast_dir}/clients/*.rb
%{yast_dir}/modules/*.rb
%{yast_dir}/schema/autoyast/rnc/*.rnc
+%dir %{yast_dir}/lib/services-manager/
%{yast_dir}/lib/services-manager/*.rb
-%dir %{yast_dir}/lib/
-%{yast_dir}/lib/services-manager/
+%dir %{yast_dir}/data/services-manager/
+%{yast_dir}/data/services-manager/*.erb
%{_prefix}/share/applications/YaST2/services-manager.desktop
# Needed for legacy support of runlevel autoyast profile
%{_prefix}/share/applications/YaST2/runlevel.desktop
++++++ yast2-services-manager-3.1.13.tar.bz2 ->
yast2-services-manager-3.1.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.13/package/yast2-services-manager.changes
new/yast2-services-manager-3.1.14/package/yast2-services-manager.changes
--- old/yast2-services-manager-3.1.13/package/yast2-services-manager.changes
2014-05-12 13:52:48.000000000 +0200
+++ new/yast2-services-manager-3.1.14/package/yast2-services-manager.changes
2014-06-06 16:32:27.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Jun 6 10:52:11 CEST 2014 - [email protected]
+
+- AutoYast summary - hard-coded ERB moved to separate file
+ to be able to generate translations (bnc#878606)
+- Added missing textdomain (bnc#881277)
+- 3.1.14
+
+-------------------------------------------------------------------
Mon May 12 09:37:03 UTC 2014 - [email protected]
- Fix displaying icon twice in control centre (bnc#874124)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.13/package/yast2-services-manager.spec
new/yast2-services-manager-3.1.14/package/yast2-services-manager.spec
--- old/yast2-services-manager-3.1.13/package/yast2-services-manager.spec
2014-05-12 13:52:48.000000000 +0200
+++ new/yast2-services-manager-3.1.14/package/yast2-services-manager.spec
2014-06-06 16:32:27.000000000 +0200
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.13
+Version: 3.1.14
Release: 0
BuildArch: noarch
@@ -45,8 +45,8 @@
BuildRequires: update-desktop-files
BuildRequires: yast2-ruby-bindings >= 1.2.0
BuildRequires: yast2 >= 3.0.5
-# need install task
-BuildRequires: rubygem-yast-rake >= 0.1.6
+# Support for 'data' directory in rake install task
+BuildRequires: rubygem-yast-rake >= 0.1.7
BuildRequires: rubygem-rspec
Summary: YaST2 - Services Manager
@@ -66,7 +66,7 @@
%check
# opensuse-13.1 does not contain rspec in default repositories
%if 0%{?suse_version} > 1310
-rspec test/*_test.rb
+rake test:unit
%endif
%install
@@ -80,9 +80,10 @@
%{yast_dir}/clients/*.rb
%{yast_dir}/modules/*.rb
%{yast_dir}/schema/autoyast/rnc/*.rnc
+%dir %{yast_dir}/lib/services-manager/
%{yast_dir}/lib/services-manager/*.rb
-%dir %{yast_dir}/lib/
-%{yast_dir}/lib/services-manager/
+%dir %{yast_dir}/data/services-manager/
+%{yast_dir}/data/services-manager/*.erb
%{_prefix}/share/applications/YaST2/services-manager.desktop
# Needed for legacy support of runlevel autoyast profile
%{_prefix}/share/applications/YaST2/runlevel.desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.13/src/clients/services-manager_auto.rb
new/yast2-services-manager-3.1.14/src/clients/services-manager_auto.rb
--- old/yast2-services-manager-3.1.13/src/clients/services-manager_auto.rb
2014-05-12 13:52:48.000000000 +0200
+++ new/yast2-services-manager-3.1.14/src/clients/services-manager_auto.rb
2014-06-06 16:07:33.000000000 +0200
@@ -1,5 +1,3 @@
-require 'erb'
-
module Yast
import 'Wizard'
import 'ServicesManager'
@@ -22,7 +20,7 @@
case function
when 'Change' then WFM.CallFunction('services-manager')
- when 'Summary' then auto_summary
+ when 'Summary' then ServicesManager.auto_summary
when 'Import' then ServicesManager.import(params)
when 'Export' then ServicesManager.export
when 'Read' then ServicesManager.read
@@ -36,28 +34,6 @@
end
end
- private
-
- def auto_summary
- result = ERB.new(summary_template).result(binding)
- Builtins.y2milestone "Returning summary: #{result}"
- result
- end
-
- def summary_template
- <<-summary
-<h2><%= _('Services Manager') %></h2>
-<p><b><%= _('Default Target') %></b></p>
-<p><%= ERB::Util.html_escape ServicesManagerTarget.export %></p>
-<p><b><%= _('Enabled Services') %></b></p>
-<ul>
-<% ServicesManagerService.export.each do |service| %>
- <li><%= ERB::Util.html_escape service %></li>
-<% end %>
-</ul>
- summary
- end
-
end
ServicesManagerAuto.new.call(WFM.Args)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.13/src/data/services-manager/autoyast_summary.erb
new/yast2-services-manager-3.1.14/src/data/services-manager/autoyast_summary.erb
---
old/yast2-services-manager-3.1.13/src/data/services-manager/autoyast_summary.erb
1970-01-01 01:00:00.000000000 +0100
+++
new/yast2-services-manager-3.1.14/src/data/services-manager/autoyast_summary.erb
2014-06-06 16:07:33.000000000 +0200
@@ -0,0 +1,14 @@
+<%
+ textdomain "services-manager"
+%>
+
+<h2><%= _('Services Manager') %></h2>
+<p><b><%= _('Default Target') %></b></p>
+<p><%= ERB::Util.html_escape(ServicesManagerTarget.export) %></p>
+
+<p><b><%= _('Enabled Services') %></b></p>
+<ul>
+<% ServicesManagerService.export.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.13/src/lib/services-manager/services_manager_profile.rb
new/yast2-services-manager-3.1.14/src/lib/services-manager/services_manager_profile.rb
---
old/yast2-services-manager-3.1.13/src/lib/services-manager/services_manager_profile.rb
2014-05-12 13:52:48.000000000 +0200
+++
new/yast2-services-manager-3.1.14/src/lib/services-manager/services_manager_profile.rb
2014-06-06 16:07:33.000000000 +0200
@@ -1,3 +1,5 @@
+require "yast"
+
module Yast
import "Report"
@@ -56,6 +58,9 @@
class ServicesManagerProfile
include Yast::Logger
+ extend Yast::I18n
+ textdomain "services-manager"
+
ENABLE = 'enable'
DISABLE = 'disable'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.13/src/modules/services_manager.rb
new/yast2-services-manager-3.1.14/src/modules/services_manager.rb
--- old/yast2-services-manager-3.1.13/src/modules/services_manager.rb
2014-05-12 13:52:48.000000000 +0200
+++ new/yast2-services-manager-3.1.14/src/modules/services_manager.rb
2014-06-06 16:07:33.000000000 +0200
@@ -1,11 +1,14 @@
require 'yast'
require 'services-manager/services_manager_profile'
+require 'erb'
module Yast
import "ServicesManagerTarget"
import "ServicesManagerService"
class ServicesManagerClass < Module
+ include Yast::Logger
+
TARGET = 'default_target'
SERVICES = 'services'
@@ -23,6 +26,11 @@
}
end
+ def auto_summary
+ erb_template =
File.expand_path("../../data/services-manager/autoyast_summary.erb", __FILE__)
+ ERB.new(File.read(erb_template)).result(binding)
+ end
+
def import data
profile = ServicesManagerProfile.new(data)
ServicesManagerTarget.import(profile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.13/test/services_manager_test.rb
new/yast2-services-manager-3.1.14/test/services_manager_test.rb
--- old/yast2-services-manager-3.1.13/test/services_manager_test.rb
2014-05-12 13:52:48.000000000 +0200
+++ new/yast2-services-manager-3.1.14/test/services_manager_test.rb
2014-06-06 16:07:33.000000000 +0200
@@ -28,6 +28,16 @@
expect(ServicesManagerTarget).to receive(:import)
ServicesManager.import(data)
end
+
+ 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"])
+
+ summary = ServicesManager.auto_summary
+ ["multi-head-graphical-hydra", "service-1", "service-<br>-2",
"service-<b>name</b>-3"].each do |item|
+ expect(summary).to match(/#{item}/)
+ end
+ end
end
context "Global public API" do
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
