From 3baf6df9c984c4f8111995f8db377e061f2370ab Mon Sep 17 00:00:00 2001 From: David Paleino Date: Wed, 31 Oct 2012 22:27:32 +0100 Subject: [PATCH] Correctly loop over all variables found in each line (LP: #897399) --- wicd/misc.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/wicd/misc.py b/wicd/misc.py index 6b25a3c..046b7ad 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -306,22 +306,22 @@ def ParseEncryption(network): # This is the last line, so we just write it. config_file = ''.join([config_file, line]) elif "$_" in line: - cur_val = re.findall('\$_([A-Z0-9_]+)', line) - if cur_val: - rep_val = network.get(cur_val[0].lower()) - if not rep_val: - # hardcode some default values - if cur_val[0] == 'SCAN': - rep_val = '1' - elif cur_val[0] == 'KEY_INDEX': - rep_val = '0' - if rep_val: - line = line.replace("$_%s" % cur_val[0], str(rep_val)) - config_file = ''.join([config_file, line]) + for cur_val in re.findall('\$_([A-Z0-9_]+)', line): + if cur_val: + rep_val = network.get(cur_val.lower()) + if not rep_val: + # hardcode some default values + if cur_val == 'SCAN': + rep_val = '1' + elif cur_val == 'KEY_INDEX': + rep_val = '0' + if rep_val: + line = line.replace("$_%s" % cur_val, str(rep_val)) + config_file = ''.join([config_file, line]) + else: + print "Ignoring template line: '%s'" % line else: - print "Ignoring template line: '%s'" % line - else: - print "Weird parsing error occurred" + print "Weird parsing error occurred" else: # Just a regular entry. config_file = ''.join([config_file, line])