From 9692fac721339ce22b5b46e382589587e3e01d78 Mon Sep 17 00:00:00 2001 From: James Rayner Date: Tue, 17 Feb 2009 12:29:01 +1100 Subject: Improve tolerance of wireless-dbus and remove hardcoded values --- src-wireless/wireless-dbus | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src-wireless/wireless-dbus') diff --git a/src-wireless/wireless-dbus b/src-wireless/wireless-dbus index d954577..bdbb3fb 100755 --- a/src-wireless/wireless-dbus +++ b/src-wireless/wireless-dbus @@ -22,9 +22,8 @@ def read_config(config): options = {} for line in cfg: (var, delim, value) = line.partition('=') - if not delim: - raise SyntaxError, 'Bad configuration file' - options[var] = value + if delim and var.lstrip()[0] != "#": + options[var] = value return options def start(profile): @@ -78,9 +77,9 @@ def start(profile): driver="wext" try: - path = wpas.getInterface("ipw0") + path = wpas.getInterface(profile["INTERFACE"]) except dbus.exceptions.DBusException: - path = wpas.addInterface("ipw0", {"driver":dbus.String(driver,variant_level=1)}) + path = wpas.addInterface(profile["INTERFACE"], {"driver":dbus.String(driver,variant_level=1)}) # Get interface object if_obj = bus.get_object(WPAS_DBUS_SERVICE, path) -- cgit v1.2.3-24-g4f1b