Merge branch 'SLE-15-SP6' into merge_SLE-15-SP6

yast · Nov 14, 2024 · 662370c · 662370c
2 parents 40ed6cd + 7b55ada
commit 662370c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/package/yast2-iscsi-client.changes b/package/yast2-iscsi-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 14 09:13:29 UTC 2024 - Knut Anderssen <[email protected]>
+
+- Fix typo introduced by previous change (bsc#1231385, bsc#1233351)
+- 4.6.5
+
 -------------------------------------------------------------------
 Thu Oct 31 11:46:26 UTC 2024 - Knut Anderssen <[email protected]>
 

diff --git a/package/yast2-iscsi-client.spec b/package/yast2-iscsi-client.spec
@@ -17,7 +17,11 @@
 
 
 Name:           yast2-iscsi-client
+<<<<<<< HEAD
 Version:        4.7.2
+=======
+Version:        4.6.5
+>>>>>>> SLE-15-SP6
 Release:        0
 Summary:        YaST2 - iSCSI Client Configuration
 License:        GPL-2.0-only

diff --git a/src/include/iscsi-client/widgets.rb b/src/include/iscsi-client/widgets.rb
@@ -252,7 +252,7 @@ def validateInitName(_key, event)
       #  "yyyy-mm" is the date at which the domain is valid and the identifier
       #  is freely selectable. For further details please check the iSCSI spec.
 
-      i_name = Convert.to_string(UI.QueryWidget(:initiator_name, :Value))
+      i_name = initiator_name_value
 
       # name not changed at all or already saved after checking it
       return true if IscsiClientLib.initiatorname == i_name
@@ -291,21 +291,22 @@ def iface_value
       UI.QueryWidget(:iface, :Value).to_s
     end
 
+    def initiator_name_value
+      UI.QueryWidget(:initiator_name, :Value).to_s
+    end
+
     def storeInitName(_key, event)
       event = deep_copy(event)
-      if Convert.to_string(UI.QueryWidget(:initiator_name, :Value)) !=
-          IscsiClientLib.initiatorname
+      if initiator_name_value != IscsiClientLib.initiatorname
         # write initiatorname
-        IscsiClientLib.writeInitiatorName(
-          Convert.to_string(UI.QueryWidget(:initiator_name, :Value))
-        )
+        IscsiClientLib.writeInitiatorName(initiator_name_value)
         # Isn't this redundant with the code at IscsiClientLib.writeInitiatorName?
         if Stage.initial
           IscsiClientLib.restart_iscsid_initial
         else
           Service.Restart("iscsid")
         end
-        log.info "write initiatorname #{IscsientLib.initiatorname}"
+        log.info "write initiatorname #{IscsiClientLib.initiatorname}"
       end
       IscsiClientLib.iface = iface_value if iface_value != IscsiClientLib.selected_iface
       nil