Author: mzugec
Date: Thu Sep 4 12:49:49 2008
New Revision: 50651
URL: http://svn.opensuse.org/viewcvs/yast?rev=50651&view=rev
Log:
fixed yast lan list configured|unconfigured (bnc#420449)
Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/lan/cmdline.ycp
Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=50651&r1=50650&r2=50651&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Thu Sep 4 12:49:49 2008
@@ -1 +1 @@
-2.17.20
+2.17.21
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=50651&r1=50650&r2=50651&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Thu Sep 4 12:49:49 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Sep 4 12:47:25 CEST 2008 - mzugec@suse.cz
+
+- fixed yast lan list configured|unconfigured (bnc#420449)
+- 2.17.21
+
+-------------------------------------------------------------------
Wed Sep 3 10:50:48 CEST 2008 - kmachalkova@suse.cz
- DNS data configuration adapted to using netconfig (resolv.conf is
Modified: trunk/network/src/lan/cmdline.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/cmdline.ycp?rev=50651&r1=50650&r2=50651&view=diff
==============================================================================
--- trunk/network/src/lan/cmdline.ycp (original)
+++ trunk/network/src/lan/cmdline.ycp Thu Sep 4 12:49:49 2008
@@ -20,18 +20,25 @@
import "LanItems";
import "Map";
-list > getConfigList(){
+list > getConfigList(string config_filter){
list > confList = [];
- //integer count = 0;
+ integer count = -1;
LanItems::BuildLanOverview();
//list > overview = (list >)LanItems::Overview();
foreach(integer position,any row, LanItems::Items, {
LanItems::current = position;
- confList = add(confList, $[tostring(size(confList )) : $["id" : position,
+ count = count + 1;
+ if (size(LanItems::getCurrentItem()["ifcfg"]:"")>0)
+ {
+ if (config_filter=="unconfigured") continue;
+ } else {
+ if (config_filter=="configured") continue;
+ }
+
+ confList = add(confList, $[ tostring(count) : $["id" : position,
"rich_descr" : LanItems::getCurrentItem()["table_descr", "rich_descr"]:"",
"descr" : LanItems::getCurrentItem()["table_descr", "table_descr", 0]:"",
"addr" : LanItems::getCurrentItem()["table_descr", "table_descr", 1]:""]]);
-// count = count + 1;
});
return confList;
}
@@ -65,7 +72,7 @@
* @param options action options
*/
define boolean ShowHandler(map options) {
- list > config = getConfigList();
+ list > config = getConfigList("");
if (validateId(options, config)==false) return false;
foreach(map row, config, {
foreach(string key, map value, (map >) row, {
@@ -81,7 +88,10 @@
}
define boolean ListHandler(map options) {
- foreach(map row, getConfigList(), {
+ string config_filter="";
+ if (contains(Map::Keys(options), "configured")) config_filter="configured";
+ if (contains(Map::Keys(options), "unconfigured")) config_filter="unconfigured";
+ foreach(map row, getConfigList(config_filter), {
foreach(string id, map detail, (map >)row, {
CommandLine::Print(sformat("%1\t%2, %3\n",id, detail["descr"]:"", detail["addr"]:""));
});
@@ -127,7 +137,7 @@
* @param options action options
*/
define boolean EditHandler(map options) {
- list > config = getConfigList();
+ list > config = getConfigList("");
if (validateId(options, config)==false) return false;
@@ -172,7 +182,7 @@
* @param options action options
*/
define boolean DeleteHandler(map options) {
- list > config = getConfigList();
+ list > config = getConfigList("");
if (validateId(options, config)==false) return false;
foreach(map row, config, {
foreach(string key, map value, (map >) row, {
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
