From 03ea89171b2376ac5b593b803ca73e7311c30de8 Mon Sep 17 00:00:00 2001 From: Jim Pryor Date: Tue, 11 Aug 2009 08:05:06 -0400 Subject: give wireless-dbus smarter read_config Signed-off-by: Jim Pryor --- src-wireless/wireless-dbus | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src-wireless/wireless-dbus') diff --git a/src-wireless/wireless-dbus b/src-wireless/wireless-dbus index 30b77d8..d30eb21 100644 --- a/src-wireless/wireless-dbus +++ b/src-wireless/wireless-dbus @@ -21,9 +21,14 @@ def read_config(config): cfg = shlex.split(open(config, "r").read()) options = {} for line in cfg: - (var, delim, value) = line.partition('=') - if delim and var.lstrip()[0] != "#": - options[var] = value + (var, delim, value) = line.partition('=') + if delim: + var = var.lstrip() # JP: allow assignments to be indented, as they can be when sourced + if var[0] != '#': + value = value.partition("#")[0].rstrip() # JP: strip off comments and trailing whitespace + if value[0] == value[-1] and value[0] in ('"',"'"): # JP: strip any surrounding quotes + value=value[1:-1] + options[var] = value return options -- cgit v1.2.3-24-g4f1b