Изменён вывод сообщений ошибок при выполнении run= exec= шаблонов

legacy27 3.6.7.3
Mike Hiretsky 4 years ago
parent 185134fe9d
commit 248560a53f

@ -3975,15 +3975,17 @@ gettext -d cl_template "$*"
p.pipe.wait()
if p.success():
self.executedFiles.append((code, execPath))
if p.readerr():
for line in p.readerr().split('\n'):
errdata = p.readerr().rstrip()
if errdata:
for line in errdata.split('\n'):
if line:
line = self.translator.translate(line)
self.printWARNING(line.strip())
return True
else:
if p.readerr():
for line in p.readerr().split('\n'):
errdata = p.readerr().rstrip()
if errdata:
for line in errdata.split('\n'):
if line:
line = self.translator.translate(line)
self.printERROR(line.strip())
@ -6122,10 +6124,8 @@ gettext -d cl_template "$*"
if HParams.RunNow in objHeadNew.params:
if not self.executeTemplate(
self.textConfig, objHeadNew.params[HParams.RunNow]):
self.setError(_("Wrong template") + _(": ") +
nameFileTemplate)
self.setError(_("Failed to execute") + _(": ") +
self.nameFileConfig)
nameFileTemplate)
return None
return None
if HParams.RunPost not in objHeadNew.params:
@ -6199,10 +6199,8 @@ gettext -d cl_template "$*"
if not self.executeTemplate(
self.textConfig,
objHeadNew.params[HParams.RunNow]):
self.setError(_("Wrong template") + _(": ") + \
nameFileTemplate)
self.setError(_("Failed to execute") + _(": ") + \
self.nameFileConfig)
nameFileTemplate)
return None
return None
if HParams.RunPost not in objHeadNew.params:
@ -6229,10 +6227,8 @@ gettext -d cl_template "$*"
if HParams.RunNow in objHeadNew.params:
if not self.executeTemplate(
self.textConfig, objHeadNew.params[HParams.RunNow]):
self.setError(_("Wrong template") + _(": ") +
nameFileTemplate)
self.setError(_("Failed to execute") + _(": ") +
self.nameFileConfig)
nameFileTemplate)
return None
return None
if HParams.RunPost not in objHeadNew.params:
@ -6258,10 +6254,8 @@ gettext -d cl_template "$*"
if HParams.RunNow in objHeadNew.params:
if not self.executeTemplate(
self.textConfig, objHeadNew.params[HParams.RunNow]):
self.setError(_("Wrong template") + _(": ") +
nameFileTemplate)
self.setError(_("Failed to execute") + _(": ") +
self.nameFileConfig)
nameFileTemplate)
return None
return None
if HParams.RunPost not in objHeadNew.params:
@ -6356,10 +6350,8 @@ gettext -d cl_template "$*"
if HParams.RunNow in objHeadNew.params:
if not self.executeTemplate(
self.textConfig, objHeadNew.params[HParams.RunNow]):
self.setError(_("Wrong template") + _(": ") + \
nameFileTemplate)
self.setError(_("Failed to execute") + _(": ") + \
self.nameFileConfig)
nameFileTemplate)
return None
return None
if HParams.RunPost not in objHeadNew.params:

Loading…
Cancel
Save