Merge 0e4808d into 64ff8b5

yast · Feb 25, 2020 · 7beed48 · 7beed48
2 parents 64ff8b5 + 0e4808d
commit 7beed48
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/library/general/src/lib/cfa/sysctl.rb b/library/general/src/lib/cfa/sysctl.rb
@@ -52,7 +52,6 @@ class Sysctl < BaseModel
 
     Yast.import "Stage"
 
-    PARSER = AugeasParser.new("sysctl.lns")
     PATH = "/etc/sysctl.d/70-yast.conf".freeze
 
     class << self
@@ -116,7 +115,7 @@ def boolean_attr(*attrs)
     boolean_attr(*BOOLEAN_ATTRIBUTES)
 
     def initialize(file_handler: Yast::TargetFile, file_path: PATH)
-      super(PARSER, file_path, file_handler: file_handler)
+      super(AugeasParser.new("sysctl.lns"), file_path, file_handler: file_handler)
     end
 
     def empty?

diff --git a/library/general/test/cfa/sysctl_test.rb b/library/general/test/cfa/sysctl_test.rb
@@ -44,6 +44,13 @@
     sysctl.load
   end
 
+  describe "#initialize" do
+    it "creates an own Augeas instance" do
+      expect(::CFA::AugeasParser).to receive(:new).with("sysctl.lns").and_call_original
+      CFA::Sysctl.new(file_handler: file_handler)
+    end
+  end
+
   describe "#raw_forward_ipv4" do
     it "returns IPv4 forwarding raw value" do
       expect(sysctl.raw_forward_ipv4).to eq("1")

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 24 15:02:15 CET 2020 - schubi@suse.de
+
+- Creating an own Augeas instance for each parsed sysctl file
+  (bsc#1151649).
+- 4.2.67
+
 -------------------------------------------------------------------
 Mon Feb 17 17:59:07 UTC 2020 - schubi@suse.de
 

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