Merge pull request #636 from teclator/no_installed

Firewalld API: running? return false if the package is not installed
yast · Nov 3, 2017 · f38c87b · f38c87b
2 parents f808c12 + 36ebb24
commit f38c87b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/library/network/src/lib/y2firewall/firewalld/api.rb b/library/network/src/lib/y2firewall/firewalld/api.rb
@@ -27,6 +27,7 @@
 
 Yast.import "Stage"
 Yast.import "Service"
+Yast.import "PackageSystem"
 
 module Y2Firewall
   class Firewalld
@@ -45,6 +46,8 @@ class Api
 
       # Map firewalld modes with their command line tools
       COMMAND = { offline: "firewall-offline-cmd", running: "firewall-cmd" }.freeze
+      # FIXME: Do not like to define twice
+      PACKAGE = "firewalld".freeze
 
       # Determines the mode in which firewalld is running and as consequence the
       # command to be used.
@@ -83,6 +86,7 @@ def permanent?
       # @return [Boolean] true if the state is running; false otherwise
       def running?
         return false if Yast::Stage.initial
+        return false if !Yast::PackageSystem.Installed(PACKAGE)
 
         state == "running"
       end

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov  3 15:39:25 UTC 2017 - knut.anderssen@suse.com
+
+- Firewalld API: running? return false if the package is not
+  installed (fate#323460)
+- 4.0.13
+
 -------------------------------------------------------------------
 Thu Oct 26 09:03:03 UTC 2017 - knut.anderssen@suse.com
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.0.12
+Version:        4.0.13
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0