Hello community,

here is the log from the commit of package yast2-packager for openSUSE:Factory 
checked in at 2019-02-15 09:53:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-packager.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager"

Fri Feb 15 09:53:56 2019 rev:364 rq:674542 version:4.1.26

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes    
2019-02-04 16:09:12.998017770 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new.28833/yast2-packager.changes 
2019-02-15 09:53:57.563787323 +0100
@@ -1,0 +2,7 @@
+Fri Feb  8 17:21:41 UTC 2019 - [email protected]
+
+- Replaced SuSEFirewall2 by firewalld when checking if the firewall
+  is running and thus maybe blocking SLP discovery (fate#323460)
+- 4.1.26
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-4.1.25.tar.bz2

New:
----
  yast2-packager-4.1.26.tar.bz2

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.zaOrw7/_old  2019-02-15 09:53:57.975787192 +0100
+++ /var/tmp/diff_new_pack.zaOrw7/_new  2019-02-15 09:53:57.975787192 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.1.25
+Version:        4.1.26
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-packager-4.1.25.tar.bz2 -> yast2-packager-4.1.26.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.1.25/package/yast2-packager.changes 
new/yast2-packager-4.1.26/package/yast2-packager.changes
--- old/yast2-packager-4.1.25/package/yast2-packager.changes    2019-01-30 
08:17:29.000000000 +0100
+++ new/yast2-packager-4.1.26/package/yast2-packager.changes    2019-02-13 
13:50:54.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Feb  8 17:21:41 UTC 2019 - [email protected]
+
+- Replaced SuSEFirewall2 by firewalld when checking if the firewall
+  is running and thus maybe blocking SLP discovery (fate#323460)
+- 4.1.26
+
+-------------------------------------------------------------------
 Tue Jan 29 08:08:04 UTC 2019 - [email protected]
 
 - Change wording of the popup that asks to enable online repos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.1.25/package/yast2-packager.spec 
new/yast2-packager-4.1.26/package/yast2-packager.spec
--- old/yast2-packager-4.1.25/package/yast2-packager.spec       2019-01-30 
08:17:29.000000000 +0100
+++ new/yast2-packager-4.1.26/package/yast2-packager.spec       2019-02-13 
13:50:54.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.1.25
+Version:        4.1.26
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-4.1.25/src/modules/SourceManagerSLP.rb 
new/yast2-packager-4.1.26/src/modules/SourceManagerSLP.rb
--- old/yast2-packager-4.1.25/src/modules/SourceManagerSLP.rb   2019-01-30 
08:17:29.000000000 +0100
+++ new/yast2-packager-4.1.26/src/modules/SourceManagerSLP.rb   2019-02-13 
13:50:54.000000000 +0100
@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "yast"
+require "y2firewall/firewalld"
 
 # YaST Namespace
 module Yast
@@ -12,7 +13,6 @@
       Yast.import "Wizard"
       Yast.import "Directory"
       Yast.import "Stage"
-      Yast.import "SuSEFirewall"
       Yast.import "Report"
       Yast.import "Label"
       #    import "IP";
@@ -541,12 +541,12 @@
       # no servers found
       if slp_services_found.nil? || Builtins.size(slp_services_found).zero?
         Builtins.y2warning("No SLP repositories were found")
-        if !Stage.initial && SuSEFirewall.IsStarted
+        if !Stage.initial && firewalld.running?
           Report.Message(
             # error popup
             _(
               "No SLP repositories have been found on your network.\n" \
-                "This could be caused by a running SuSEfirewall2,\n" \
+                "This could be caused by a running firewall,\n" \
                 "which probably blocks the network scanning."
             )
           )
@@ -580,6 +580,10 @@
       url
     end
 
+    def firewalld
+      Y2Firewall::Firewalld.instance
+    end
+
     publish function: :SelectOneSLPService, type: "string ()"
     publish function: :AddSourceTypeSLP, type: "string ()"
   end


Reply via email to