Исправления для совместимости с calculate-lib

develop 3.4.0
Mike Khiretskiy 9 years ago
parent 404ce951c3
commit b0ce98e865

@ -21,7 +21,8 @@ import re
from calculate.lib.datavars import (Variable,VariableError,ReadonlyVariable, from calculate.lib.datavars import (Variable,VariableError,ReadonlyVariable,
ReadonlyTableVariable,FieldValue) ReadonlyTableVariable,FieldValue)
from calculate.lib.cl_template import iniParser from calculate.lib.cl_template import iniParser
from calculate.lib.utils.files import readLinesFile,isMount,readFile, find from calculate.lib.utils.files import (readLinesFile,isMount,readFile, find,
FindFileType)
from calculate.lib.utils.common import getValueFromCmdLine,cmpVersion from calculate.lib.utils.common import getValueFromCmdLine,cmpVersion
from calculate.lib.utils.portage import isPkgInstalled from calculate.lib.utils.portage import isPkgInstalled
from calculate.lib.variables.user import VariableUrLogin from calculate.lib.variables.user import VariableUrLogin
@ -654,7 +655,8 @@ class VariableClClientSymlinks(ReadonlyVariable):
reSkip = re.compile("|".join(map(lambda x:x.replace("*",".*"), reSkip = re.compile("|".join(map(lambda x:x.replace("*",".*"),
skipFiles))).search skipFiles))).search
return filter(lambda x:not reSkip(x), return filter(lambda x:not reSkip(x),
find(self.Get('ur_home_path'),onefilesystem=True,filetype='l')) find(self.Get('ur_home_path'),onefilesystem=True,
filetype=FindFileType.SymbolicLink))
class VariableClClientNscdCache(Variable): class VariableClClientNscdCache(Variable):
""" """

Loading…
Cancel
Save