From a23deb7dac033b9249e37d637a4afe98f9cb5197 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Thu, 14 Nov 2024 08:43:01 +0000 Subject: [PATCH 1/2] Fix typo when modifying the initiatorname. --- src/include/iscsi-client/widgets.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/include/iscsi-client/widgets.rb b/src/include/iscsi-client/widgets.rb index 9083a8b..e8376ca 100644 --- 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 From 9b8a6a8a6542d7e6836b1c93ea42ad55a2cf5cf6 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Thu, 14 Nov 2024 09:16:48 +0000 Subject: [PATCH 2/2] Bump version & changelog --- package/yast2-iscsi-client.changes | 6 ++++++ package/yast2-iscsi-client.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2-iscsi-client.changes b/package/yast2-iscsi-client.changes index efbf630..d5282c9 100644 --- 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 + +- Fix typo introduced by previous change (bsc#1231385, bsc#1233351) +- 4.6.5 + ------------------------------------------------------------------- Thu Oct 31 11:46:26 UTC 2024 - Knut Anderssen diff --git a/package/yast2-iscsi-client.spec b/package/yast2-iscsi-client.spec index 446db0d..7ee8a52 100644 --- a/package/yast2-iscsi-client.spec +++ b/package/yast2-iscsi-client.spec @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 4.6.4 +Version: 4.6.5 Release: 0 Summary: YaST2 - iSCSI Client Configuration License: GPL-2.0-only