Hello community,
here is the log from the commit of package yast2-iscsi-client
checked in at Thu Jun 8 16:44:32 CEST 2006.
--------
--- yast2-iscsi-client/yast2-iscsi-client.changes 2006-05-25 18:19:21.000000000 +0200
+++ yast2-iscsi-client/yast2-iscsi-client.changes 2006-06-08 15:43:22.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Jun 8 15:38:37 CEST 2006 - mzugec@suse.cz
+
+- fixed #179013 - gets confused if the target names are similar
+
+-------------------------------------------------------------------
+Thu Jun 8 11:28:21 CEST 2006 - mzugec@suse.cz
+
+- fixed #180985 - staying current row in connected dialog
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-2.13.18.tar.bz2
New:
----
yast2-iscsi-client-2.13.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.lHOLrc/_old 2006-06-08 16:43:05.000000000 +0200
+++ /var/tmp/diff_new_pack.lHOLrc/_new 2006-06-08 16:43:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-client (Version 2.13.18)
+# spec file for package yast2-iscsi-client (Version 2.13.20)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-iscsi-client
-Version: 2.13.18
+Version: 2.13.20
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-client-2.13.18.tar.bz2
+Source0: yast2-iscsi-client-2.13.20.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2
@@ -29,7 +29,7 @@
%prep
-%setup -n yast2-iscsi-client-2.13.18
+%setup -n yast2-iscsi-client-2.13.20
%build
%{prefix}/bin/y2tool y2autoconf
@@ -65,6 +65,10 @@
%doc %{prefix}/share/doc/packages/yast2-iscsi-client
%changelog -n yast2-iscsi-client
+* Thu Jun 08 2006 - mzugec@suse.cz
+- fixed #179013 - gets confused if the target names are similar
+* Thu Jun 08 2006 - mzugec@suse.cz
+- fixed #180985 - staying current row in connected dialog
* Thu May 25 2006 - mzugec@suse.cz
- fixed #149055 - iscsi client login always asks for credentials
* Thu May 04 2006 - mzugec@suse.cz
++++++ yast2-iscsi-client-2.13.18.tar.bz2 -> yast2-iscsi-client-2.13.20.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.18/VERSION new/yast2-iscsi-client-2.13.20/VERSION
--- old/yast2-iscsi-client-2.13.18/VERSION 2006-05-25 18:14:00.000000000 +0200
+++ new/yast2-iscsi-client-2.13.20/VERSION 2006-06-08 15:38:32.000000000 +0200
@@ -1 +1 @@
-2.13.18
+2.13.20
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.18/configure new/yast2-iscsi-client-2.13.20/configure
--- old/yast2-iscsi-client-2.13.18/configure 2006-05-25 18:03:30.000000000 +0200
+++ new/yast2-iscsi-client-2.13.20/configure 2006-06-08 15:33:31.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-iscsi-client 2.13.17.
+# Generated by GNU Autoconf 2.59 for yast2-iscsi-client 2.13.19.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-iscsi-client'
PACKAGE_TARNAME='yast2-iscsi-client'
-PACKAGE_VERSION='2.13.17'
-PACKAGE_STRING='yast2-iscsi-client 2.13.17'
+PACKAGE_VERSION='2.13.19'
+PACKAGE_STRING='yast2-iscsi-client 2.13.19'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-iscsi-client 2.13.17 to adapt to many kinds of systems.
+\`configure' configures yast2-iscsi-client 2.13.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-iscsi-client 2.13.17:";;
+ short | recursive ) echo "Configuration of yast2-iscsi-client 2.13.19:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-iscsi-client configure 2.13.17
+yast2-iscsi-client configure 2.13.19
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-iscsi-client $as_me 2.13.17, which was
+It was created by yast2-iscsi-client $as_me 2.13.19, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-iscsi-client'
- VERSION='2.13.17'
+ VERSION='2.13.19'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.17"
+VERSION="2.13.19"
RPMNAME="yast2-iscsi-client"
MAINTAINER="Michal Zugec "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-iscsi-client $as_me 2.13.17, which was
+This file was extended by yast2-iscsi-client $as_me 2.13.19, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-iscsi-client config.status 2.13.17
+yast2-iscsi-client config.status 2.13.19
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.18/configure.in new/yast2-iscsi-client-2.13.20/configure.in
--- old/yast2-iscsi-client-2.13.18/configure.in 2006-05-25 18:03:24.000000000 +0200
+++ new/yast2-iscsi-client-2.13.20/configure.in 2006-06-08 15:33:25.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-client, 2.13.17, http://bugs.opensuse.org/, yast2-iscsi-client)
+AC_INIT(yast2-iscsi-client, 2.13.19, http://bugs.opensuse.org/, yast2-iscsi-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.17"
+VERSION="2.13.19"
RPMNAME="yast2-iscsi-client"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.18/iscsi-client.pot new/yast2-iscsi-client-2.13.20/iscsi-client.pot
--- old/yast2-iscsi-client-2.13.18/iscsi-client.pot 2006-03-22 16:21:29.000000000 +0100
+++ new/yast2-iscsi-client-2.13.20/iscsi-client.pot 2006-06-01 13:47:19.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-22 16:21+0100\n"
+"POT-Creation-Date: 2006-06-01 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,88 +16,83 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/IscsiClient.ycp:214
+#: src/IscsiClient.ycp:259
#, ycp-format
msgid "<p>To configure the iSCSI initiator, the <b>%1</b> package must be installed.</p>"
msgstr ""
-#: src/IscsiClient.ycp:215
+#: src/IscsiClient.ycp:260
msgid "<p>Install it now?</p>"
msgstr ""
#. IscsiClient read dialog caption
-#: src/IscsiClient.ycp:308
+#: src/IscsiClient.ycp:366
msgid "Initializing iSCSI Initiator Configuration"
msgstr ""
#. Progress stage 1/3
-#: src/IscsiClient.ycp:320
+#: src/IscsiClient.ycp:378
msgid "Read the database"
msgstr ""
#. Progress stage 2/3
-#: src/IscsiClient.ycp:322
+#: src/IscsiClient.ycp:380
msgid "Read the previous settings"
msgstr ""
#. Progress stage 3/3
-#: src/IscsiClient.ycp:324
+#: src/IscsiClient.ycp:382
msgid "Detect the devices"
msgstr ""
#. Progress step 1/3
-#: src/IscsiClient.ycp:327
+#: src/IscsiClient.ycp:385
msgid "Reading the database..."
msgstr ""
#. Progress step 2/3
-#: src/IscsiClient.ycp:329
+#: src/IscsiClient.ycp:387
msgid "Reading the previous settings..."
msgstr ""
#. Progress step 3/3
-#: src/IscsiClient.ycp:331
+#: src/IscsiClient.ycp:389
msgid "Detecting the devices..."
msgstr ""
#. Progress finished
-#: src/IscsiClient.ycp:333 src/IscsiClient.ycp:408
+#: src/IscsiClient.ycp:391 src/IscsiClient.ycp:465
msgid "Finished"
msgstr ""
#. IscsiClient read dialog caption
-#: src/IscsiClient.ycp:387
+#: src/IscsiClient.ycp:444
msgid "Saving iSCSI Initiator Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/IscsiClient.ycp:399
+#: src/IscsiClient.ycp:456
msgid "Write the settings"
msgstr ""
#. Progress stage 2/2
-#: src/IscsiClient.ycp:401
+#: src/IscsiClient.ycp:458
msgid "Run SuSEconfig"
msgstr ""
#. Progress step 1/2
-#: src/IscsiClient.ycp:404
+#: src/IscsiClient.ycp:461
msgid "Writing the settings..."
msgstr ""
#. Progress step 2/2
-#: src/IscsiClient.ycp:406
+#: src/IscsiClient.ycp:463
msgid "Running SuSEconfig..."
msgstr ""
-#. Error message
-#: src/IscsiClient.ycp:417
-msgid "Cannot write settings."
-msgstr ""
-
#. TODO FIXME: your code here...
#. Configuration summary text for autoyast
-#: src/IscsiClient.ycp:464
+#: src/IscsiClient.ycp:517
msgid "Configuration summary..."
msgstr ""
@@ -121,98 +116,100 @@
msgid "Manually"
msgstr ""
-#: src/dialogs.ycp:49 src/dialogs.ycp:67 src/dialogs.ycp:86
+#: src/dialogs.ycp:50 src/dialogs.ycp:70 src/dialogs.ycp:91
msgid "Portal Address"
msgstr ""
-#: src/dialogs.ycp:49 src/dialogs.ycp:67 src/dialogs.ycp:86
+#: src/dialogs.ycp:50 src/dialogs.ycp:70 src/dialogs.ycp:91
msgid "Target Name"
msgstr ""
-#: src/dialogs.ycp:49
+#: src/dialogs.ycp:50
msgid "Start-Up"
msgstr ""
-#: src/dialogs.ycp:53
+#: src/dialogs.ycp:54
msgid "Add"
msgstr ""
-#: src/dialogs.ycp:54
+#: src/dialogs.ycp:55
msgid "Log Out"
msgstr ""
-#: src/dialogs.ycp:55
+#: src/dialogs.ycp:56
msgid "Toggle Start-Up"
msgstr ""
-#: src/dialogs.ycp:67 src/dialogs.ycp:86
+#: src/dialogs.ycp:70 src/dialogs.ycp:91
msgid "Connected"
msgstr ""
-#: src/dialogs.ycp:71
+#: src/dialogs.ycp:74
msgid "Discovery"
msgstr ""
-#: src/dialogs.ycp:72
+#: src/dialogs.ycp:75
msgid "Log In"
msgstr ""
-#. `PushButton(_("Discovery")),
-#: src/dialogs.ycp:91
+#: src/dialogs.ycp:95
msgid "Connect"
msgstr ""
-#: src/dialogs.ycp:102 src/dialogs.ycp:124
+#: src/dialogs.ycp:108 src/dialogs.ycp:132
msgid "No Authentication"
msgstr ""
-#: src/dialogs.ycp:104 src/dialogs.ycp:126
+#: src/dialogs.ycp:110 src/dialogs.ycp:134
msgid "Incoming Authentication"
msgstr ""
-#: src/dialogs.ycp:106 src/dialogs.ycp:111 src/dialogs.ycp:128
-#: src/dialogs.ycp:133
+#: src/dialogs.ycp:112 src/dialogs.ycp:117 src/dialogs.ycp:136
+#: src/dialogs.ycp:141
msgid "Username"
msgstr ""
-#: src/dialogs.ycp:106 src/dialogs.ycp:111 src/dialogs.ycp:128
-#: src/dialogs.ycp:133
+#: src/dialogs.ycp:112 src/dialogs.ycp:117 src/dialogs.ycp:136
+#: src/dialogs.ycp:141
msgid "Password"
msgstr ""
-#: src/dialogs.ycp:109 src/dialogs.ycp:131
+#: src/dialogs.ycp:115 src/dialogs.ycp:139
msgid "Outgoing Authentication"
msgstr ""
-#: src/dialogs.ycp:145
+#: src/dialogs.ycp:155
msgid "IP Address"
msgstr ""
-#: src/dialogs.ycp:146
+#: src/dialogs.ycp:156
msgid "Port"
msgstr ""
-#: src/dialogs.ycp:156
+#: src/dialogs.ycp:168
msgid "Service"
msgstr ""
-#: src/dialogs.ycp:176
+#: src/dialogs.ycp:189
msgid "Connected Targets"
msgstr ""
-#: src/dialogs.ycp:192
+#: src/dialogs.ycp:207
msgid "Discovered Targets"
msgstr ""
-#: src/dialogs.ycp:213
+#: src/dialogs.ycp:228
msgid "iSCSI Initiator Overview"
msgstr ""
-#: src/dialogs.ycp:221 src/helps.ycp:86 src/helps.ycp:94 src/helps.ycp:97
+#. discovery new target
+#. dialog for all targets from portal (connected/disconnected)
+#. authentification dialog for add/discovery target
+#: src/dialogs.ycp:236 src/helps.ycp:87 src/helps.ycp:95 src/helps.ycp:99
msgid "<h1>iSCSI Initiator</h1>"
msgstr ""
-#: src/dialogs.ycp:237 src/dialogs.ycp:270 src/dialogs.ycp:292
+#: src/dialogs.ycp:253 src/dialogs.ycp:286 src/dialogs.ycp:309
msgid "iSCSI Initiator Discovery"
msgstr ""
@@ -293,6 +290,7 @@
"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
msgstr ""
+#. table of connected targets
#: src/helps.ycp:77
msgid ""
"List of current sessions. To add a new target, press <b>Add</b>.\n"
@@ -301,34 +299,31 @@
msgstr ""
#. Warning
-#: src/helps.ycp:83 src/helps.ycp:91
+#: src/helps.ycp:83 src/helps.ycp:92
msgid "<h1>Warning</h1>"
msgstr ""
-#: src/helps.ycp:83
+#: src/helps.ycp:83 src/helps.ycp:92
msgid "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n"
msgstr ""
-#: src/helps.ycp:86
+#: src/helps.ycp:87
msgid ""
"Enter the <b>IP Address</b> of the discovered server.\n"
"Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n"
"select <b>No Authentication</b>.\n"
msgstr ""
-#: src/helps.ycp:91
-msgid "<p>When accessing a iSCSI-device <b>READ</b>/<b>WRITE</b>please make sure that this access is exclusive. Otherwise the potential risk of data corruption is there.</p>\n"
-msgstr ""
-
-#: src/helps.ycp:95
+#: src/helps.ycp:96
msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. "
msgstr ""
-#: src/helps.ycp:97
+#: src/helps.ycp:99
msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
msgstr ""
-#: src/helps.ycp:99
+#. list of discovered targets
+#: src/helps.ycp:102
msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
msgstr ""
@@ -352,43 +347,51 @@
msgid "&iSCSI Initiator"
msgstr ""
-#: src/widgets.ycp:65 src/widgets.ycp:77
+#: src/widgets.ycp:27
+msgid "Command timed-out"
+msgstr ""
+
+#: src/widgets.ycp:67 src/widgets.ycp:79
msgid "Insert the username."
msgstr ""
-#: src/widgets.ycp:70 src/widgets.ycp:82
+#: src/widgets.ycp:72 src/widgets.ycp:84
msgid "Insert the password."
msgstr ""
-#: src/widgets.ycp:128
+#: src/widgets.ycp:96
+msgid "Error While Connecting iscsid"
+msgstr ""
+
+#: src/widgets.ycp:135
msgid "Really log out from the selected target?"
msgstr ""
-#: src/widgets.ycp:129
+#: src/widgets.ycp:136
msgid "Error occurred while logging out from the selected target."
msgstr ""
-#: src/widgets.ycp:131 src/widgets.ycp:143
-msgid "No record found"
+#: src/widgets.ycp:141 src/widgets.ycp:160
+msgid "No record found."
msgstr ""
-#: src/widgets.ycp:204
+#: src/widgets.ycp:251
msgid "Insert the IP address."
msgstr ""
-#: src/widgets.ycp:209
+#: src/widgets.ycp:257
msgid "Insert the port."
msgstr ""
-#: src/widgets.ycp:259 src/widgets.ycp:301
+#: src/widgets.ycp:326 src/widgets.ycp:382
msgid "True"
msgstr ""
-#: src/widgets.ycp:259 src/widgets.ycp:301
+#: src/widgets.ycp:326 src/widgets.ycp:382
msgid "False"
msgstr ""
-#: src/widgets.ycp:272 src/widgets.ycp:313
+#: src/widgets.ycp:347 src/widgets.ycp:396
msgid "The target is already connected."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.18/src/IscsiClient.ycp new/yast2-iscsi-client-2.13.20/src/IscsiClient.ycp
--- old/yast2-iscsi-client-2.13.18/src/IscsiClient.ycp 2006-05-25 18:18:25.000000000 +0200
+++ new/yast2-iscsi-client-2.13.20/src/IscsiClient.ycp 2006-06-08 15:39:36.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: IscsiClient settings, input and output functions
* Authors: Michal Zugec
*
- * $Id: IscsiClient.ycp 31156 2006-05-25 16:17:12Z mzugec $
+ * $Id: IscsiClient.ycp 31393 2006-06-08 13:37:10Z mzugec $
*
* Representation of the configuration of iscsi-client.
* Input and output routines.
@@ -308,15 +308,15 @@
}
// check if given target is connected
-global boolean connected(string ip, string target){
+global boolean connected(string rec_number){
boolean ret = false;
foreach(string row, sessions, {
- if (issubstring(row, ip) && issubstring(row, target)){
+ if (issubstring(row, rec_number)){
ret = true;
break;
}
});
- y2milestone("Target %1 with IP %2 connected:%3", target, ip, ret);
+ y2milestone("Target %1 connected:%2", rec_number, ret);
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.18/src/widgets.ycp new/yast2-iscsi-client-2.13.20/src/widgets.ycp
--- old/yast2-iscsi-client-2.13.18/src/widgets.ycp 2006-05-25 18:13:46.000000000 +0200
+++ new/yast2-iscsi-client-2.13.20/src/widgets.ycp 2006-06-08 15:26:32.000000000 +0200
@@ -24,7 +24,7 @@
integer sleep_step = 20;
while (cont_loop && ((boolean) SCR::Read(.background.output_open))) {
if (time_spent >= script_time_out) {
- Popup::Error("Command timed-out");
+ Popup::Error(_("Command timed-out"));
cont_loop = false;
}
time_spent = time_spent + sleep_step;
@@ -93,7 +93,8 @@
// init table of connected sessions
void initConnectedTable(string key){
- if (IscsiClient::readSessions()== false) Popup::Error("Error While Connecting iscsid");
+ if (IscsiClient::readSessions()== false) Popup::Error(_("Error While Connecting iscsid"));
+ integer row_current = (integer) UI::QueryWidget(`connected, `CurrentItem);
list <term> items = [];
integer row = 0;
foreach(string s, IscsiClient::sessions, {
@@ -103,6 +104,7 @@
row = row + 1;
});
UI::ChangeWidget (`id (`connected), `Items, items);
+ UI::ChangeWidget(`connected, `CurrentItem, row_current);
UI::SetFocus (`id (`connected));
}
@@ -236,7 +238,7 @@
return nil;
}
-global boolean validateDiscAuth(string key, map event){
+boolean validateDiscAuth(string key, map event){
return checkAuthEntry();
}
// *******************Server Location ***********************
@@ -306,7 +308,7 @@
any selected = UI::QueryWidget(`discovered, `CurrentItem);
if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); }
else { params = []; }
- if ((params==[])||(IscsiClient::connected(params[1]:"", params[2]:""))){
+ if ((params==[])||(IscsiClient::connected( deletechars(params[0]:"", "[]") ))){
UI::ChangeWidget (`id (`connect), `Enabled, false);
UI::ChangeWidget (`id (`delete), `Enabled, false);
} else{
@@ -321,9 +323,9 @@
integer row = 0;
foreach(string s, IscsiClient::getDiscovered(), {
list<string> row_in_string = splitstring(s, " ");
- string record = deletechars(row_in_string[0]:"", "[]");
+// string record = deletechars(row_in_string[0]:"", "[]");
items = add(items, `item(`id(row), row_in_string[1]:"", row_in_string[2]:"",
- (IscsiClient::connected(row_in_string[1]:"", row_in_string[2]:""))?_("True"):_("False") ));
+ (IscsiClient::connected( deletechars(row_in_string[0]:"", "[]") ))?_("True"):_("False") ));
row = row + 1;
});
@@ -343,7 +345,7 @@
// connect new target
if ( event["ID"]:nil == `connect) {
// check if not already connected
- if ( IscsiClient::connected(params[1]:"", params[2]:"") == true){
+ if ( IscsiClient::connected( curr_rec ) == true){
Popup::Error(_("The target is already connected."));
return nil;
}
@@ -356,7 +358,7 @@
}
// delete connected item
if ( event["ID"]:nil == `delete) {
- if ((params == [])||(!IscsiClient::connected(params[1]:"", params[2]:""))){
+ if ((params == [])||(!IscsiClient::connected( curr_rec ))){
SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -r %1 --op=delete", deletechars(params[0]:"", "[]")), $[] );
IscsiClient::readSessions();
initDiscoveredTable("");
@@ -379,7 +381,7 @@
list<string> row_in_string = splitstring(s, " ");
string record = deletechars(row_in_string[0]:"", "[]");
items = add(items, `item(`id(row), row_in_string[1]:"", row_in_string[2]:"",
- (IscsiClient::connected(row_in_string[1]:"", row_in_string[2]:""))?_("True"):_("False") ));
+ (IscsiClient::connected( record ))?_("True"):_("False") ));
row = row + 1;
});
UI::ChangeWidget (`id (`targets), `Items, items);
@@ -392,7 +394,7 @@
if ( event["ID"]:nil == `connect) {
// check if is not already connected
list <string> params = splitstring( IscsiClient::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " );
- if ( IscsiClient::connected(params[1]:"", params[2]:"") == true){
+ if ( IscsiClient::connected( deletechars(params[0]:"", "[]") ) == true){
Popup::Error(_("The target is already connected."));
} else {
curr_rec = deletechars(params[0]:"", "[]");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org