From 59d1f7501903753a2e89b3adffb2a3f16e40c659 Mon Sep 17 00:00:00 2001 From: lxnay Date: Tue, 3 Jun 2008 00:29:13 +0000 Subject: [PATCH] Entropy/entropyTools: - improve writeParameterToFile() by using regexps git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2092 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropyTools.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py index b236c08c7..db48e03a9 100644 --- a/libraries/entropyTools.py +++ b/libraries/entropyTools.py @@ -76,10 +76,10 @@ class TimeScheduled(threading.Thread): self.function(self.data) else: self.function() - try: + try: time.sleep(self.delay) - except: - pass + except: + pass def kill(self): self.alive = 0 @@ -1726,10 +1726,12 @@ def writeParameterToFile(config_file, name, data): param_found = False if data: proposed_line = "%s|%s" % (name,data,) + myreg = re.compile('^(%s)?[|].*$' % (name,)) else: proposed_line = "# %s|" % (name,) + myreg = re.compile('^#([ \t]+?)?(%s)?[|].*$' % (name,)) for line in content: - if line.startswith(name+"|"): + if myreg.match(line): param_found = True line = proposed_line f.write(line+"\n")