Author: mzugec Date: Sun Jul 22 10:03:21 2007 New Revision: 39583 URL: http://svn.opensuse.org/viewcvs/yast?rev=39583&view=rev Log: don't use getcfg in IsConnected function Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkDevices.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=39583&r1=39... ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Sun Jul 22 10:03:21 2007 @@ -1 +1 @@ -2.15.40 +2.15.41 Modified: trunk/yast2/library/network/src/NetworkDevices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Network... ============================================================================== --- trunk/yast2/library/network/src/NetworkDevices.ycp (original) +++ trunk/yast2/library/network/src/NetworkDevices.ycp Sun Jul 22 10:03:21 2007 @@ -292,6 +292,7 @@ * return interface name * @example MatchInterface("eth-id-00:01:DE:AD:BE:EF") -> "eth0" */ +/* global string MatchInterface(string dev) { string cmd = "getcfg-interface " + dev; map dn =(map) SCR::Execute(.target.bash_output, cmd); @@ -299,7 +300,7 @@ return devname; } - +*/ /** * Test whether device is connected (Link:up) * The info is taken from sysfs @@ -308,8 +309,8 @@ */ global boolean IsConnected(string dev) { if (!Mode::testsuite()) { - string iface = MatchInterface(dev); - string cmd = "cat /sys/class/net/" + iface + "/carrier"; +// string iface = MatchInterface(dev); + string cmd = "cat /sys/class/net/" + dev + "/carrier"; map ret = (map) SCR::Execute(.target.bash_output, cmd); y2milestone("Sysfs returned %1", ret); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=3... ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Sun Jul 22 10:03:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Jul 22 10:02:08 CEST 2007 - mzugec@suse.de + +- don't use getcfg in IsConnected function +- 2.15.41 + +------------------------------------------------------------------- Wed Jul 18 16:56:45 CEST 2007 - lslezak@suse.cz - PackageCallbacksInit.ycp - register ProgressReport callbacks -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org