Merge pull request #837 from yast/bug_1109812

Do not modify the value if it is the same.
yast · Oct 1, 2018 · 7773623 · 7773623
2 parents ecad7e8 + bcc3380
commit 7773623
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/library/network/src/lib/y2firewall/firewalld/relations.rb b/library/network/src/lib/y2firewall/firewalld/relations.rb
@@ -81,6 +81,7 @@ def has_attributes(*attributes, scope: nil, cache: false) # rubocop:disable Styl
           attr_reader attribute
 
           define_method "#{attribute}=" do |item|
+            return item if public_send(attribute) == item
             instance_variable_set("@#{attribute}", item)
 
             modified!(attribute) if cache
@@ -183,6 +184,7 @@ def has_many(*relations, scope: nil, cache: false) # rubocop:disable Style/Predi
           attr_reader relation
 
           define_method "#{relation}=" do |item|
+            return item if public_send(relation) == item
             instance_variable_set("@#{relation}", item)
 
             modified!(relation) if cache

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 28 08:05:15 UTC 2018 - knut.anderssen@suse.com
+
+- Y2Firewall::Firewalld: Single attributes setter will not modify
+  the value of the attribute in case it is the same (bsc#1109812)
+- 4.0.97
+
 -------------------------------------------------------------------
 Wed Sep 19 13:36:40 UTC 2018 - igonzalezsosa@suse.com
 

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