Author: mzugec
Date: Fri Jan 11 13:14:32 2008
New Revision: 43559
URL: http://svn.opensuse.org/viewcvs/yast?rev=43559&view=rev
Log:
remove ocurrences of deprecated NetworkInterfaces::device_name
Modified:
trunk/yast2/library/network/src/Internet.ycp
trunk/yast2/library/network/src/NetworkInterfaces.ycp
trunk/yast2/package/yast2.changes
Modified: trunk/yast2/library/network/src/Internet.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Internet.ycp?rev=43559&r1=43558&r2=43559&view=diff
==============================================================================
--- trunk/yast2/library/network/src/Internet.ycp (original)
+++ trunk/yast2/library/network/src/Internet.ycp Fri Jan 11 13:14:32 2008
@@ -13,7 +13,6 @@
module "Internet";
import "Map";
-import "NetworkDevices";
import "NetworkService";
import "Service";
@@ -66,7 +65,7 @@
}
/**
- * Used if NetworkDevices cannot find anything (usually because NM runs)
+ * Used if NetworkInterfaces cannot find anything (usually because NM runs)
* Calls ip
* @return eg. ["eth0", "eth1"]
*/
Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=43559&r1=43558&r2=43559&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original)
+++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Fri Jan 11 13:14:32 2008
@@ -713,7 +713,6 @@
maplist(string typ, map > devsmap, (map > >) Devs, {
maplist(string config, map devmap, devsmap, {
/* write sysconfig */
-// string dev = device_name(typ, num);
string p = ".network.value.\"" + config + "\".";
if (size(devmap["IPADDR"]:"")>0 && size(devmap["NETMASK"]:"")>0){
@@ -1309,8 +1308,8 @@
global define list<string> Locate(string key, string val) {
list<string> ret = [];
maplist(string typ, map devsmap, Devices, {
- maplist(string num, map devmap, (map) devsmap, {
- if(devmap[key]:"" == val) ret = add(ret, device_name(typ,num));
+ maplist(string device, map devmap, (map) devsmap, {
+ if(devmap[key]:"" == val) ret = add(ret, device);
});
});
@@ -1326,8 +1325,8 @@
global define list<string> LocateNOT(string key, string val) {
list<string> ret = [];
maplist(string typ, map devsmap, Devices, {
- maplist(string num, map devmap, (map) devsmap, {
- if(devmap[key]:"" != val) ret = add(ret, device_name(typ,num));
+ maplist(string device, map devmap, (map) devsmap, {
+ if(devmap[key]:"" != val) ret = add(ret, device);
});
});
@@ -1409,8 +1408,8 @@
list<string> ret = [];
if(devregex == "" || devregex == nil) {
maplist(string t, map d, Devices, {
- maplist(string n, (list<string>) Map::Keys(d), {
- ret[size(ret)] = device_name(t,n);
+ maplist(string device, (list<string>) Map::Keys(d), {
+ ret[size(ret)] = device;
});
});
}
@@ -1419,15 +1418,11 @@
string regex = "^(" + DeviceRegex[devregex]:devregex + ")$";
maplist(string t, map d, Devices, {
if(regexpmatch(t, regex)) {
- maplist(string n, (list<string>) Map::Keys(d), {
- ret[size(ret)] = device_name(t,n);
+ maplist(string device, (list<string>) Map::Keys(d), {
+ ret[size(ret)] = device;
});
}
});
- /*
- map d = Devices[type]:$[];
- maplist(string n, Map::Keys(d), {ret[size(ret)] = device_name(type,n);});
- */
}
ret = filter(string row, ret, {
if (row!=nil) return true;
Modified: trunk/yast2/package/yast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=43559&r1=43558&r2=43559&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Fri Jan 11 13:14:32 2008
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Jan 11 14:11:16 CET 2008 - mzugec@suse.de
+
+- remove ocurrences of deprecated NetworkInterfaces::device_name
+
+-------------------------------------------------------------------
Tue Jan 8 17:20:27 CET 2007 - mzugec@suse.cz
- added NetworkInterfaces module (NetworkDevices will be deprecated)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
