Author: mzugec Date: Tue Mar 23 10:49:27 2010 New Revision: 61445 URL: http://svn.opensuse.org/viewcvs/yast?rev=61445&view=rev Log: fixed description for IP/netmask (bnc#588590) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=61445&r1=61444&r2=61445&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Tue Mar 23 10:49:27 2010 @@ -1 +1 @@ -2.17.128 +2.17.129 Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp?rev=61445&r1=61444&r2=61445&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp Tue Mar 23 10:49:27 2010 @@ -485,12 +485,14 @@ if (ip != "NONE") { string prefixlen = NetworkInterfaces::Current["PREFIXLEN"]:""; - string descr = sformat("%1 %2", _("IP address assigned using"), ip); - if (!issubstring(ip, "DHCP")) descr=(size(prefixlen)>0) ? + if (size(ip)>0){ + string descr = sformat("%1 %2", _("IP address assigned using"), ip); + if (!issubstring(ip, "DHCP")) descr=(size(prefixlen)>0) ? sformat(_("IP address: %1/%2"), ip, prefixlen) : sformat(_("IP address: %1, subnet mask %2") , ip, NetworkInterfaces::Current["NETMASK"]:""); - bullets = bullets + [ descr ]; + bullets = bullets + [ descr ]; + } } // build aliases overview if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org