Hello community,

here is the log from the commit of package yast2-services-manager for 
openSUSE:Factory checked in at 2017-07-17 10:31:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-services-manager"

Mon Jul 17 10:31:15 2017 rev:35 rq:509788 version:3.3.0

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes
    2017-02-18 03:15:30.334803885 +0100
+++ 
/work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes
       2017-07-17 10:31:16.026755732 +0200
@@ -1,0 +2,7 @@
+Wed Jul 12 11:25:20 UTC 2017 - jreidin...@suse.com
+
+- Fix failing ERB template in ruby 2.4 (will be default for SLE15
+  so part of bsc#1044312)
+- 3.3.0
+
+-------------------------------------------------------------------

Old:
----
  yast2-services-manager-3.2.1.tar.bz2

New:
----
  yast2-services-manager-3.3.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.C1MXMy/_old  2017-07-17 10:31:16.554681304 +0200
+++ /var/tmp/diff_new_pack.C1MXMy/_new  2017-07-17 10:31:16.558680740 +0200
@@ -24,7 +24,7 @@
 ######################################################################
 
 Name:           yast2-services-manager
-Version:        3.2.1
+Version:        3.3.0
 Release:        0
 BuildArch:      noarch
 
@@ -89,7 +89,6 @@
 %{yast_dir}/data/services-manager/*.erb
 %{_prefix}/share/applications/YaST2/services-manager.desktop
 
-%dir %_docdir/
 %_docdir/%name/
 %_docdir/%name/COPYING
 

++++++ yast2-services-manager-3.2.1.tar.bz2 -> 
yast2-services-manager-3.3.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-services-manager-3.2.1/package/yast2-services-manager.changes 
new/yast2-services-manager-3.3.0/package/yast2-services-manager.changes
--- old/yast2-services-manager-3.2.1/package/yast2-services-manager.changes     
2017-02-15 16:54:21.361183717 +0100
+++ new/yast2-services-manager-3.3.0/package/yast2-services-manager.changes     
2017-07-12 15:56:40.577616626 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Jul 12 11:25:20 UTC 2017 - jreidin...@suse.com
+
+- Fix failing ERB template in ruby 2.4 (will be default for SLE15
+  so part of bsc#1044312)
+- 3.3.0
+
+-------------------------------------------------------------------
 Mon Feb 13 14:34:34 CET 2017 - sch...@suse.de
 
 - AutoYaST: "Write" can be called in first and second installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-services-manager-3.2.1/package/yast2-services-manager.spec 
new/yast2-services-manager-3.3.0/package/yast2-services-manager.spec
--- old/yast2-services-manager-3.2.1/package/yast2-services-manager.spec        
2017-02-15 16:54:21.361183717 +0100
+++ new/yast2-services-manager-3.3.0/package/yast2-services-manager.spec        
2017-07-12 15:56:40.577616626 +0200
@@ -24,7 +24,7 @@
 ######################################################################
 
 Name:           yast2-services-manager
-Version:        3.2.1
+Version:        3.3.0
 Release:        0
 BuildArch:      noarch
 
@@ -89,6 +89,5 @@
 %{yast_dir}/data/services-manager/*.erb
 %{_prefix}/share/applications/YaST2/services-manager.desktop
 
-%dir %_docdir/
 %_docdir/%name/
 %_docdir/%name/COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-services-manager-3.2.1/src/data/services-manager/autoyast_summary.erb 
new/yast2-services-manager-3.3.0/src/data/services-manager/autoyast_summary.erb
--- 
old/yast2-services-manager-3.2.1/src/data/services-manager/autoyast_summary.erb 
    2017-02-15 16:54:21.377183717 +0100
+++ 
new/yast2-services-manager-3.3.0/src/data/services-manager/autoyast_summary.erb 
    2017-07-12 15:56:40.581616626 +0200
@@ -5,12 +5,12 @@
 <h2><%= _('Services Manager') %></h2>
 <p><b><%= _('Default Target') %></b></p>
 <ul><li><%= ERB::Util.html_escape(
-  ServicesManagerTargetClass::BaseTargets.localize(
-    ServicesManagerTarget.export
+  Yast::ServicesManagerTargetClass::BaseTargets.localize(
+    Yast::ServicesManagerTarget.export
   )
 ) %></li></ul>
 
-<% services = ServicesManagerService.export %>
+<% services = Yast::ServicesManagerService.export %>
 
 <h2><%= _('Services') %></h2>
 <p><b><%= _('Enabled') %></b></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-services-manager-3.2.1/src/modules/services_manager.rb 
new/yast2-services-manager-3.3.0/src/modules/services_manager.rb
--- old/yast2-services-manager-3.2.1/src/modules/services_manager.rb    
2017-02-15 16:54:21.381183717 +0100
+++ new/yast2-services-manager-3.3.0/src/modules/services_manager.rb    
2017-07-12 15:56:40.581616626 +0200
@@ -2,6 +2,19 @@
 require 'services-manager/services_manager_profile'
 require 'erb'
 
+class ServicesManagerERBTemplate
+  include Yast::I18n
+
+  def initialize
+    textdomain "services-manager"
+  end
+
+  def render
+    erb_template = 
File.expand_path("../../data/services-manager/autoyast_summary.erb", __FILE__)
+    ERB.new(File.read(erb_template)).result(binding)
+  end
+end
+
 module Yast
   import "ServicesManagerTarget"
   import "ServicesManagerService"
@@ -28,8 +41,7 @@
         # AutoYast summary
         _("Not configured yet.")
       else
-        erb_template = 
File.expand_path("../../data/services-manager/autoyast_summary.erb", __FILE__)
-        ERB.new(File.read(erb_template)).result(binding)
+        ServicesManagerERBTemplate.new.render
       end
     end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-services-manager-3.2.1/test/services_manager_service_test.rb 
new/yast2-services-manager-3.3.0/test/services_manager_service_test.rb
--- old/yast2-services-manager-3.2.1/test/services_manager_service_test.rb      
2017-02-15 16:54:21.389183717 +0100
+++ new/yast2-services-manager-3.3.0/test/services_manager_service_test.rb      
2017-07-12 15:56:40.581616626 +0200
@@ -24,7 +24,6 @@
       allow(Service).to receive(:Enabled).with("zbus").and_return true
       allow(Service).to receive(:Enabled).with("lsb").and_return false
       allow(Service).to receive(:Enabled).with("").and_return true
-
     end
 
     before do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-services-manager-3.2.1/test/services_manager_test.rb 
new/yast2-services-manager-3.3.0/test/services_manager_test.rb
--- old/yast2-services-manager-3.2.1/test/services_manager_test.rb      
2017-02-15 16:54:21.397183717 +0100
+++ new/yast2-services-manager-3.3.0/test/services_manager_test.rb      
2017-07-12 15:56:40.581616626 +0200
@@ -233,15 +233,11 @@
       it "has available methods for both target and services" do
         public_methods = [ :save, :read, :reset, :modified ]
         public_methods.each do |method|
-          ServicesManagerService.stub(method)
-          ServicesManagerTarget.stub(method)
           expect(ServicesManagerService).to receive(method)
-          expect(ServicesManagerTarget).to  receive(method)
+          expect(ServicesManagerTarget).to receive(method)
           ServicesManager.__send__(method)
         end
 
-        ServicesManagerService.stub(:modified=)
-        ServicesManagerTarget.stub(:modified=)
         expect(ServicesManagerService).to receive(:modified=).with(true)
         expect(ServicesManagerTarget).to receive(:modified=).with(true)
         ServicesManager.__send__(:modify)


Reply via email to