|
|
|
@ -186,21 +186,31 @@ class _terms(_error):
|
|
|
|
|
cl_base.exit(1)
|
|
|
|
|
# Номера версий для ini
|
|
|
|
|
flagNotIniFunct = True
|
|
|
|
|
if flagFunction and "ini" == searchFunct.group(1):
|
|
|
|
|
# Если номер версии в двух аргументах
|
|
|
|
|
if not self._re_not_Version.search(vals[1]) and\
|
|
|
|
|
not self._re_not_Version.search(valVars):
|
|
|
|
|
verFile, verVar = self._convertVers(vals[1],valVars)
|
|
|
|
|
exec(\
|
|
|
|
|
"res=("+"'"+verVar+"'"+sepF+"'"+verFile+"'"+")")
|
|
|
|
|
if res:
|
|
|
|
|
listEqual.append("1")
|
|
|
|
|
else:
|
|
|
|
|
listEqual.append("0")
|
|
|
|
|
flagNotIniFunct = False
|
|
|
|
|
# Два значения не пусты
|
|
|
|
|
flagNotEmptyVals = not (valVars == "" and vals[1] == "")
|
|
|
|
|
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
|
|
|
|
|
# Cравниваем номера версий
|
|
|
|
|
if flagNotIniFunct:
|
|
|
|
|
if not (valVars == "" and vals[1] == "") and\
|
|
|
|
|
if flagNotEmptyVals and\
|
|
|
|
|
("_ver" in vals[0] or\
|
|
|
|
|
(flagFunction and searchFunct.group(1) == "pkg") or\
|
|
|
|
|
(flagFunction and searchFunct.group(1) == "load" and\
|
|
|
|
|