|
|
|
@ -3091,7 +3091,7 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
|
|
|
|
|
return textTemplateTmp
|
|
|
|
|
self.printERROR(_(funArgv))
|
|
|
|
|
raise TemplatesInterrupt(_("Execution of templates was "
|
|
|
|
|
"interrupted with the error"),
|
|
|
|
|
"interrupted with an error"),
|
|
|
|
|
TemplatesInterrupt.ABORT)
|
|
|
|
|
|
|
|
|
|
def getElogTimestamp(self):
|
|
|
|
@ -4317,7 +4317,7 @@ gettext -d cl_template "$*"
|
|
|
|
|
self.printWARNING("")
|
|
|
|
|
self.printWARNING(_("Headers of directory templates and headers "
|
|
|
|
|
"of files on the first level should include "
|
|
|
|
|
"an action variable."))
|
|
|
|
|
"an action variable"))
|
|
|
|
|
self.printWARNING(_("Example:"))
|
|
|
|
|
self.printWARNING("# Calculate ac_install_merge==on")
|
|
|
|
|
return skipDirs + skipTemplates
|
|
|
|
@ -4577,7 +4577,7 @@ gettext -d cl_template "$*"
|
|
|
|
|
self.filesApply = map(lambda x:autoUpdateDict.get(x,x),self.filesApply)
|
|
|
|
|
if filter(lambda x:"._cfg" in x, self.filesApply):
|
|
|
|
|
self.printWARNING(_("Some config files need updating. "
|
|
|
|
|
"Perform dispatch-conf."))
|
|
|
|
|
"Perform run dispatch-conf."))
|
|
|
|
|
if self.dispatchConf and \
|
|
|
|
|
self.objVar.Get('cl_dispatch_conf') == 'dispatch' and \
|
|
|
|
|
self.objVar.Get('cl_ebuild_phase') == '':
|
|
|
|
|