|
|
|
@ -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\
|
|
|
|
|