Author: mzugec Date: Thu Mar 18 11:24:46 2010 New Revision: 61368 URL: http://svn.opensuse.org/viewcvs/yast?rev=61368&view=rev Log: InternetTest: fixed NetworkManager issue (bnc#589079) Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/Internet.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/VERSION?rev=61368&r1=61367&r2=61368&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Thu Mar 18 11:24:46 2010 @@ -1 +1 @@ -2.17.89 +2.17.90 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/Internet.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/Internet.ycp?rev=61368&r1=61367&r2=61368&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/Internet.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/Internet.ycp Thu Mar 18 11:24:46 2010 @@ -156,6 +156,11 @@ * @return true if interface is up (which is not equal to connected) */ global define boolean Status() { + // Skip test in case of NM because it returns code 3 (interface under NM controll) + if(NetworkService::IsManaged ()){ + y2milestone("Skipping interface status test because of NetworkManager"); + return true; + } integer ret = (integer) SCR::Execute(.target.bash, "/sbin/ifstatus " + device); y2milestone ("ifstatus %1: %2", device, ret); return ret == 0 || ret == 10; Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes?rev=61368&r1=61367&r2=61368&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Thu Mar 18 11:24:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 18 11:22:22 CET 2010 - mzugec@suse.cz + +- InternetTest: fixed NetworkManager issue (bnc#589079) +- 2.17.90 + +------------------------------------------------------------------- Tue Mar 16 14:49:06 CET 2010 - jsuchome@suse.cz - SERVICES.pm moved to webyast-services-ws (bnc#587876) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org