From f3d9a3b6da987fc8d841a5da45320d7285790cdf Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Mon, 3 Aug 2009 19:29:18 -0400 Subject: [PATCH] Actually display the error messag we get when scanning fails in the ioctl backend. Make sure we actually abort the connection attempt when authentication validation fails. --- wicd/backends/be-ioctl.py | 2 +- wicd/networking.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wicd/backends/be-ioctl.py b/wicd/backends/be-ioctl.py index 3d16486..a51db1b 100644 --- a/wicd/backends/be-ioctl.py +++ b/wicd/backends/be-ioctl.py @@ -288,7 +288,7 @@ class WirelessInterface(Interface, BaseWirelessInterface): try: results = self.scan_iface.Scan() except iwscan.error, e: - print "ERROR: %s" + print "ERROR: %s" % e return [] return filter(None, [self._parse_ap(cell) for cell in results]) diff --git a/wicd/networking.py b/wicd/networking.py index 13ec635..1269e5c 100644 --- a/wicd/networking.py +++ b/wicd/networking.py @@ -866,7 +866,8 @@ class WirelessConnectThread(ConnectThread): if self.network.get('enctype'): self.SetStatus('validating_authentication') if not wiface.ValidateAuthentication(time.time()): - if not self.connect_result: + print "connect result is %s" % self.connect_result + if not self.connect_result or self.connect_result == 'Failed': self.abort_connection('bad_pass') # Set up gateway, IP address, and DNS servers.