Discard some functions

master3.3
Mike Hiretsky 11 years ago
parent 16b1944821
commit 96e2f11792

@ -3041,6 +3041,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
"""
Вывод успешного сообщения
"""
# TODO: need remove
return textTemplateTmp
self.printSUCCESS(_(funArgv))
textTemplateTmp = textTemplateTmp[:resS.start()] + \
textTemplateTmp[resS.end():]
@ -3050,6 +3052,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
"""
Вывод сообщения с предупреждением
"""
# TODO: need remove
return textTemplateTmp
self.printWARNING(_(funArgv))
textTemplateTmp = textTemplateTmp[:resS.start()] + \
textTemplateTmp[resS.end():]
@ -3059,6 +3063,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
"""
Вывод сообщения с ошибкой
"""
# TODO: need remove
return textTemplateTmp
self.printERROR(_(funArgv))
textTemplateTmp = textTemplateTmp[:resS.start()] + \
textTemplateTmp[resS.end():]
@ -3068,6 +3074,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
"""
Вывод сообщения с ошибкой
"""
# TODO: need remove
return textTemplateTmp
self.printSUCCESS(_(funArgv))
raise TemplatesInterrupt(_("Applying was stop"),TemplatesInterrupt.EXIT)
@ -3075,6 +3083,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
"""
Вывод сообщения с ошибкой
"""
# TODO: need remove
return textTemplateTmp
self.printERROR(_(funArgv))
raise TemplatesInterrupt(_("Applying was interrupted"),
TemplatesInterrupt.ABORT)
@ -3100,6 +3110,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
def funcElog(self,funArgv, resS, localVars, textTemplateTmp, nameTemp):
"""Function for work with emerge.log"""
# TODO: need remove
return textTemplateTmp
funArgv = funArgv.strip()
rePkg = re.compile(r'completed emerge \(\d+ of \d+\) (\S+)\s',re.S)
logFile = '/var/log/emerge.log'
@ -3127,6 +3139,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
return textTemplateTmp
def funcConfirm(self,funArgv, resS, localVars, textTemplateTmp, nameTemp):
# TODO: need remove
return textTemplateTmp
res = self.askConfirm(_(funArgv))
textTemplateTmp = textTemplateTmp[:resS.start()] + res + \
textTemplateTmp[resS.end():]

Loading…
Cancel
Save