|
|
|
@ -1629,7 +1629,7 @@ class _file(_error):
|
|
|
|
|
self.textTemplate = try_decode_utf8(self.F_TEMPL.read())
|
|
|
|
|
self.closeTemplFile()
|
|
|
|
|
if self.configMode == T_NEWCFG:
|
|
|
|
|
origConfigName = re.sub(r'/._cfg\d{4}_([^/]+)$', r'/\\1',
|
|
|
|
|
origConfigName = re.sub(r'/._cfg\d{4}_([^/]+)$', '/\\1',
|
|
|
|
|
self.nameFileConfig)
|
|
|
|
|
if newBuffer is None:
|
|
|
|
|
self.textConfig = readFile(origConfigName)
|
|
|
|
@ -4322,8 +4322,8 @@ gettext -d cl_template "$*"
|
|
|
|
|
rePar = re.compile(reg, re.I)
|
|
|
|
|
reP = rePar.search(textLine)
|
|
|
|
|
if reP:
|
|
|
|
|
reg = r"\A([^\n]*\n)+[^\n]*\n*" if not binary \
|
|
|
|
|
else rb"\A([^\n]*\n)+[^\n]*\n*"
|
|
|
|
|
reg = r"\A([^\\\n]*\\\n)+[^\n]*\n*" if not binary \
|
|
|
|
|
else rb"\A([^\\\n]*\\\n)+[^\n]*\n*"
|
|
|
|
|
reLns = re.compile(reg, re.M)
|
|
|
|
|
reLs = reLns.search(text)
|
|
|
|
|
if reLs:
|
|
|
|
@ -4771,6 +4771,7 @@ gettext -d cl_template "$*"
|
|
|
|
|
# ключи: HParams.OptDir.{Path,Skip,Autoupdate}
|
|
|
|
|
optDir = {}
|
|
|
|
|
ret = True
|
|
|
|
|
##scanDir == '/var/db/repos/calculate/profiles/templates/3.6/2_ac_install_merge/media-sound/pulseaudio/daemon.conf'
|
|
|
|
|
if not prefix:
|
|
|
|
|
prefix = os.path.realpath(scanDir)
|
|
|
|
|
if not flagDir:
|
|
|
|
|