do not crash when attributes are not present; replace by defaults instead
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 11 Feb 2008 23:39:29 +0000 (23:39 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 11 Feb 2008 23:39:29 +0000 (23:39 +0000)
lib/python/Screens/NetworkSetup.py

index 8a3dadb5baf03333c2493fcfdaad1b1397d3c176..cf03f1179e2e38d7d05ed5aaf8baf9d98fc7a1cb 100644 (file)
@@ -109,11 +109,11 @@ class AdapterSetup(Screen, ConfigListScreen):
                self.iface = iface
 
                print iNetwork.getAdapterAttribute(self.iface, "dhcp")
-               self.dhcpConfigEntry = NoSave(ConfigYesNo(default=iNetwork.getAdapterAttribute(self.iface, "dhcp")))
+               self.dhcpConfigEntry = NoSave(ConfigYesNo(default=iNetwork.getAdapterAttribute(self.iface, "dhcp") or False))
                self.hasGatewayConfigEntry = NoSave(ConfigYesNo(default=True))
-               self.ipConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "ip")))
-               self.netmaskConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "netmask")))
-               self.gatewayConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "gateway")))
+               self.ipConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "ip")) or [0,0,0,0])
+               self.netmaskConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "netmask") or [255,0,0,0]))
+               self.gatewayConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "gateway") or [0,0,0,0]))
        
                self["iface"] = Label(iNetwork.getFriendlyAdapterName(self.iface))