Merge 395c9f2 into 73b4373

yast · Sep 30, 2020 · 0fff07e · 0fff07e
2 parents 73b4373 + 395c9f2
commit 0fff07e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 30 10:49:56 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Do not import SuSEFirewall2 anymore as the support was dropped
+  from YaST (fate#323460)
+- 4.3.7
+
 -------------------------------------------------------------------
 Thu Sep 17 13:06:05 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.3.6
+Version:        4.3.7
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only

diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb
@@ -41,7 +41,6 @@ def initialize_add_on_add_on_workflow(include_target)
       Yast.import "SourceManager"
       Yast.import "PackageSystem"
       Yast.import "ProductProfile"
-      Yast.import "SuSEFirewall"
       Yast.import "Stage"
       Yast.import "Wizard"
       Yast.import "Confirm"

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -18,9 +18,6 @@ def stub_module(name)
 # Stub classes from other modules to speed up a build
 stub_module("AutoinstGeneral")
 stub_module("AutoinstSoftware")
-# the SuSEFirewall module checks the firewall status in the constructor,
-# avoid displaying a PolicyKit popup asking for the root password...
-stub_module("SuSEFirewall")
 
 if ENV["COVERAGE"]
   require "simplecov"