fixed network device screwup, other logic errors

2 files changed, 22 insertions, 12 deletions

diff --git a/text.py b/text.py
index 108b8a870..cb846c2a5 100644
--- a/text.py
+++ b/text.py
@@ -185,7 +185,6 @@ class AuthConfigWindow:
         return INSTALL_OK
 
 class NetworkWindow:
-            
     def run(self, screen, todo):
         def setsensitive (self):
             if self.cb.selected ():
@@ -223,7 +222,7 @@ class NetworkWindow:
                     self.ns.set (ns)
 
         devices = todo.network.available ()
-        if not devices.items () == 0:
+        if devices.items () == 0:
             return INSTALL_NOOP
         dev = devices[devices.keys ()[0]]
 
@@ -268,25 +267,36 @@ class NetworkWindow:
         toplevel.add (bb, 0, 2, growx = 1)
 
         setsensitive (self)
-        
-        result = toplevel.runOnce ()
-        
-        if self.cb.selected ():
-            dev.set (("bootproto", "dhcp"))
-            dev.unset ("ipaddr", "netmask", "network", "broadcast")
-        else:
-            self.calculateIPs ()
+
+        while 1:
+            result = toplevel.run ()
+            if self.cb.selected ():
+                dev.set (("bootproto", "dhcp"))
+                dev.unset ("ipaddr", "netmask", "network", "broadcast")
+            else:
+                try:
+                    (network, broadcast) = isys.inet_calcNetBroad (self.ip.value (), self.nm.value ())
+                except:
+                    ButtonChoiceWindow(screen, _("Invalid information"),
+                                       _("You must enter valid IP information to continue"),
+                                       buttons = [ _("Ok") ])
+                    continue
+
             dev.set (("bootproto", "static"))
             dev.set (("ipaddr", self.ip.value ()), ("netmask", self.nm.value ()),
-                     ("network", self.network), ("broadcast", self.broadcast))
+                     ("network", network), ("broadcast", broadcast))
             todo.network.gateway = self.gw.value ()
             todo.network.primaryNS = self.ns.value ()
             todo.network.guessHostnames ()
+            screen.popWindow()
+            break
                      
         dev.set (("onboot", "yes"))
 
         rc = bb.buttonPressed (result)
 
+        todo.log ("\"" + dev.get ("device") + "\"")
+
         if rc == "back":
             return INSTALL_BACK
         return INSTALL_OK
diff --git a/todo.py b/todo.py
index 231855d45..1f4e2fbcd 100644
--- a/todo.py
+++ b/todo.py
@@ -85,7 +85,7 @@ class Network:
             info = {}
             for line in lines:
                 netinf = string.splitfields (line, '=')
-                info [netinf[0]] = netinf[1]
+                info [netinf[0]] = string.strip (netinf[1])
             self.netdevices [info["DEVICE"]] = NetworkDevice (info["DEVICE"])
             if info.has_key ("IPADDR"):
                 self.netdevices [info["DEVICE"]].set (("IPADDR", info["IPADDR"]))