From 5137d897aa2365a938b41275881d6f2bf4bd208b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Fri, 16 Apr 2010 11:06:36 +0400 Subject: [PATCH] Bugfix --- pym/cl_profile.py | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pym/cl_profile.py b/pym/cl_profile.py index 39ea277..a949eda 100644 --- a/pym/cl_profile.py +++ b/pym/cl_profile.py @@ -191,23 +191,16 @@ class _terms(_error): if flagFunction and flagNotEmptyVals and\ searchFunct.group(1) == "ini": # Проверка значения на версию - if self._re_not_Version.search(vals[1]): - self.setError("'%s'"%term + " " + _("incorrect")) - self.setError (_("Value is not version")) - return False - # Проверка значения функции на версию - if self._re_not_Version.search(valVars): - self.setError("'%s'"%term + " " + _("incorrect")) - self.setError (_("Value function is not version")) - return False - verFile, verVar = self._convertVers(vals[1],valVars) - exec(\ - "res=("+"'"+verVar+"'"+sepF+"'"+verFile+"'"+")") - if res: - listEqual.append("1") - else: - listEqual.append("0") - flagNotIniFunct = False + if not self._re_not_Version.search(valVars) and\ + not self._re_not_Version.search(vals[1]): + verFile, verVar = self._convertVers(vals[1],valVars) + exec(\ + "res=("+"'"+verVar+"'"+sepF+"'"+verFile+"'"+")") + if res: + listEqual.append("1") + else: + listEqual.append("0") + flagNotIniFunct = False # Cравниваем номера версий if flagNotIniFunct: if flagNotEmptyVals and\