Author: mzugec Date: Wed Jan 30 13:39:21 2008 New Revision: 44007 URL: http://svn.opensuse.org/viewcvs/yast?rev=44007&view=rev Log: adapt for upstream-style iscsiadm output (without recordID) (#356969) Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION?rev=44007&r1=44006&r2=44007&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION Wed Jan 30 13:39:21 2008 @@ -1 +1 @@ -2.14.38 +2.14.39 Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=44007&r1=44006&r2=44007&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Wed Jan 30 13:39:21 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 29 21:08:49 CET 2008 - mzugec@suse.de + +- adapt for upstream-style iscsiadm output (without recordID) +(#356969) +- 2.14.39 + +------------------------------------------------------------------- Tue Nov 20 16:29:53 CET 2007 - mzugec@suse.cz - fixed testsuite Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp?rev=44007&r1=44006&r2=44007&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp Wed Jan 30 13:39:21 2008 @@ -254,7 +254,7 @@ }); foreach(string row, tmp_disc, { list<string> tmp_row = splitstring(row, " "); - discovered = add(discovered, sformat("%1 %2", tmp_row[1]:"", tmp_row[2]:"")); + discovered = add(discovered, sformat("%1 %2", tmp_row[0]:"", tmp_row[1]:"")); }); } y2milestone("Discovered sessions %1", discovered); Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp?rev=44007&r1=44006&r2=44007&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp Wed Jan 30 13:39:21 2008 @@ -427,7 +427,7 @@ IscsiClient::targets = []; foreach(string row, trg_list, { list<string> tmp_list=splitstring(row, " "); - if (issubstring(tmp_list[1]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[1]:"", tmp_list[2]:"")); + if (issubstring(tmp_list[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[0]:"", tmp_list[1]:"")); }); while(!bg_finish){}; // restore old config -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org