Author: mzugec Date: Thu Jan 24 13:58:23 2008 New Revision: 43869 URL: http://svn.opensuse.org/viewcvs/yast?rev=43869&view=rev Log: replace deprecated NetworkDevices by NetworkInterfaces (from yast2) Modified: trunk/dhcp-server/VERSION trunk/dhcp-server/package/yast2-dhcp-server.changes trunk/dhcp-server/src/DhcpServer.pm trunk/dhcp-server/src/commandline.ycp trunk/dhcp-server/src/dialogs2.ycp Modified: trunk/dhcp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/VERSION?rev=43869&r1=43868&r2=43869&view=diff ============================================================================== --- trunk/dhcp-server/VERSION (original) +++ trunk/dhcp-server/VERSION Thu Jan 24 13:58:23 2008 @@ -1 +1 @@ -2.15.5 +2.15.6 Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-server.changes?rev=43869&r1=43868&r2=43869&view=diff ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Thu Jan 24 13:58:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 24 13:51:30 CET 2008 - mzugec@suse.cz + +- replace deprecated NetworkDevices by NetworkInterfaces (from yast2) +- 2.15.6 + +------------------------------------------------------------------- Mon Jan 7 12:11:11 CET 2008 - kmachalkova@suse.cz - Merged proofread texts Modified: trunk/dhcp-server/src/DhcpServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/DhcpServer.pm?rev=43869&r1=43868&r2=43869&view=diff ============================================================================== --- trunk/dhcp-server/src/DhcpServer.pm (original) +++ trunk/dhcp-server/src/DhcpServer.pm Thu Jan 24 13:58:23 2008 @@ -104,7 +104,7 @@ YaST::YCP::Import ("Ldap"); YaST::YCP::Import ("LdapServerAccess"); YaST::YCP::Import ("Mode"); -YaST::YCP::Import ("NetworkDevices"); +YaST::YCP::Import ("NetworkInterfaces"); YaST::YCP::Import ("Netmask"); YaST::YCP::Import ("PackageSystem"); #YaST::YCP::Import ("ProductFeatures"); @@ -1416,10 +1416,10 @@ # Reading current network configuration if (!Mode->config()) { - NetworkDevices->Read(); + NetworkInterfaces->Read(); } my $ifaces_found = 0; - foreach my $iface (@{ NetworkDevices->List("") }) { + foreach my $iface (@{ NetworkInterfaces->List("") }) { next if ($iface =~ /^lo/i); next if ($iface =~ /^sit/i); $ifaces_found = 1; @@ -2263,10 +2263,10 @@ else { chomp($interface); - y2warning ("ifconfig didn't return meaningful data about $interface, asking NetworkDevices"); - $ip = NetworkDevices->GetValue($interface, "IPADDR"); - $bcast = NetworkDevices->GetValue($interface, "BROADCAST"); - $netmask = NetworkDevices->GetValue($interface, "NETMASK"); + y2warning ("ifconfig didn't return meaningful data about $interface, asking NetworkInterfaces"); + $ip = NetworkInterfaces->GetValue($interface, "IPADDR"); + $bcast = NetworkInterfaces->GetValue($interface, "BROADCAST"); + $netmask = NetworkInterfaces->GetValue($interface, "NETMASK"); } #at least IP and netmask must be defined Modified: trunk/dhcp-server/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/commandline.ycp?rev=43869&r1=43868&r2=43869&view=diff ============================================================================== --- trunk/dhcp-server/src/commandline.ycp (original) +++ trunk/dhcp-server/src/commandline.ycp Thu Jan 24 13:58:23 2008 @@ -12,7 +12,7 @@ import "CommandLine"; import "DhcpServer"; -import "NetworkDevices"; +import "NetworkInterfaces"; textdomain "dhcp-server"; @@ -166,8 +166,8 @@ * @return boolean true if settings have been changed */ boolean InterfaceHandler (map options) { - NetworkDevices::Read (); - list<string> all_interfaces = NetworkDevices::List (""); + NetworkInterfaces::Read (); + list<string> all_interfaces = NetworkInterfaces::List (""); all_interfaces = filter (string i, all_interfaces, { return i != "lo"; }); Modified: trunk/dhcp-server/src/dialogs2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dialogs2.ycp?rev=43869&r1=43868&r2=43869&view=diff ============================================================================== --- trunk/dhcp-server/src/dialogs2.ycp (original) +++ trunk/dhcp-server/src/dialogs2.ycp Thu Jan 24 13:58:23 2008 @@ -23,7 +23,7 @@ import "DialogTree"; import "CWMServiceStart"; //import "ProductFeatures"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Report"; import "Mode"; import "Netmask"; @@ -187,20 +187,20 @@ { Wizard::DisableBackButton(); - foreach (string iface, NetworkDevices::List(""), { + foreach (string iface, NetworkInterfaces::List(""), { if (iface != "" && !issubstring(iface, "lo") && !issubstring(iface, "sit")) { - string device_name = NetworkDevices::GetValue(iface, "NAME"); + string device_name = NetworkInterfaces::GetValue(iface, "NAME"); if (size(device_name) > 40) { device_name = substring (device_name, 0, 37) + "..."; } DhcpServerUI::ifaces[iface] = $[ "device" : device_name, - "ipaddr" : (NetworkDevices::GetValue(iface, "BOOTPROTO") == "dhcp" ? + "ipaddr" : (NetworkInterfaces::GetValue(iface, "BOOTPROTO") == "dhcp" ? // TRANSLATORS: Table items; Informs that the IP is a DHCP Address _("DHCP address") : - NetworkDevices::GetValue(iface, "IPADDR") + NetworkInterfaces::GetValue(iface, "IPADDR") ), "active" : false, ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org