diff options
author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-01-09 22:39:47 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-01-09 22:40:39 (GMT) |
commit | 446d5c69af89b06a2c2435f8298807a666a0ae32 (patch) | |
tree | 68164b9051ab4140f5b8b6e7df4b47adda89529a | |
parent | c069d04d222bc4dd89b10214d4b91d3da0f5068f (diff) |
#5884: don't crash on non-ascii characters in essids.
-rw-r--r-- | shell/hardware/nminfo.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/shell/hardware/nminfo.py b/shell/hardware/nminfo.py index c1a6326..3a93120 100644 --- a/shell/hardware/nminfo.py +++ b/shell/hardware/nminfo.py @@ -394,15 +394,13 @@ class NMInfo(object): config.read(self._cfg_file) networks = {} for name in config.sections(): - if not isinstance(name, unicode): - name = unicode(name) - net = Network(name) try: + net = Network(name) net.read_from_config(config) networks[name] = net - except NetworkInvalidError, e: - logging.debug("Error: invalid stored network config: %s" % e) - del net + except Exception, e: + logging.error("Error when processing config for the network %s: %r" % (name, e)) + del config return networks |