|
|
|
@ -589,7 +589,7 @@ class cl_install(color_print):
|
|
|
|
|
self.listDisksOptions = []
|
|
|
|
|
self.listBindsOptions = []
|
|
|
|
|
self.listSwapsOptions = []
|
|
|
|
|
self.startMessage = False
|
|
|
|
|
self.startMessage = ""
|
|
|
|
|
Spinner().setWriteFunc(self.defaultPrint)
|
|
|
|
|
|
|
|
|
|
def colorPrint(self,*argv,**kwarg):
|
|
|
|
@ -1148,21 +1148,28 @@ class cl_install(color_print):
|
|
|
|
|
"""Print waiting message and OK or Error by func result"""
|
|
|
|
|
message = "%s ..." % message
|
|
|
|
|
self.printSUCCESS(message,printBR=False)
|
|
|
|
|
self.printRight(self.lenString(message)+5,4)
|
|
|
|
|
self.startMessage = True
|
|
|
|
|
self.startMessage = message
|
|
|
|
|
|
|
|
|
|
def printByResult(self,result,failMessage=None):
|
|
|
|
|
if result:
|
|
|
|
|
self.printLine((('blueBr','['),
|
|
|
|
|
('greenBr',' ok '),
|
|
|
|
|
('blueBr',']')),[])
|
|
|
|
|
else:
|
|
|
|
|
self.printLine((('blueBr','['),
|
|
|
|
|
('redBr',' !! '),
|
|
|
|
|
('blueBr',']')),[])
|
|
|
|
|
if failMessage:
|
|
|
|
|
self.printERROR(failMessage)
|
|
|
|
|
self.startMessage = False
|
|
|
|
|
if self.startMessage:
|
|
|
|
|
self.defaultPrint("\r")
|
|
|
|
|
self.printLine((('greenBr',' * '),
|
|
|
|
|
('',self.startMessage),
|
|
|
|
|
),
|
|
|
|
|
(('',''),
|
|
|
|
|
), 0, False)
|
|
|
|
|
self.printRight(self.lenString(self.startMessage)+5,4)
|
|
|
|
|
if result:
|
|
|
|
|
self.printLine((('blueBr','['),
|
|
|
|
|
('greenBr',' ok '),
|
|
|
|
|
('blueBr',']')),[])
|
|
|
|
|
else:
|
|
|
|
|
self.printLine((('blueBr','['),
|
|
|
|
|
('redBr',' !! '),
|
|
|
|
|
('blueBr',']')),[])
|
|
|
|
|
if failMessage:
|
|
|
|
|
self.printERROR(failMessage)
|
|
|
|
|
self.startMessage = ""
|
|
|
|
|
|
|
|
|
|
def setupOpenGL(self):
|
|
|
|
|
defaultGL = "xorg-x11"
|
|
|
|
@ -1360,14 +1367,12 @@ the system") + " (yes/no)"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# install distributive
|
|
|
|
|
distrCopy = True
|
|
|
|
|
self.printSUCCESS("%s ... "%
|
|
|
|
|
_("Unpacking system image into target"),printBR=False)
|
|
|
|
|
self.printMessageForTest(
|
|
|
|
|
_("Unpacking system image into target"))
|
|
|
|
|
self.defaultPrint(" ")
|
|
|
|
|
self.clVars.Get('os_grub_conf')
|
|
|
|
|
targetDistr.installFrom(sourceDistr)
|
|
|
|
|
self.defaultPrint('\n')
|
|
|
|
|
distrCopy = False
|
|
|
|
|
self.printSUCCESS("Unpacking complete")
|
|
|
|
|
self.printByResult(True)
|
|
|
|
|
|
|
|
|
|
# join templates
|
|
|
|
|
self.printMessageForTest(_("Updating config"))
|
|
|
|
@ -1404,19 +1409,11 @@ the system") + " (yes/no)"
|
|
|
|
|
for i in apply(traceback.format_exception, sys.exc_info()):
|
|
|
|
|
error += i
|
|
|
|
|
except KeyboardInterrupt,e:
|
|
|
|
|
if self.startMessage:
|
|
|
|
|
self.defaultPrint("\b\b")
|
|
|
|
|
self.printByResult(False)
|
|
|
|
|
if distrCopy:
|
|
|
|
|
distrCopy = False
|
|
|
|
|
self.defaultPrint("\n")
|
|
|
|
|
self.printByResult(False)
|
|
|
|
|
self.printWARNING("Interrupting the installation")
|
|
|
|
|
error = _("Installation manually interrupt")
|
|
|
|
|
if self.startMessage:
|
|
|
|
|
if error:
|
|
|
|
|
self.printByResult(False)
|
|
|
|
|
if distrCopy:
|
|
|
|
|
distrCopy = False
|
|
|
|
|
self.defaultPrint("\n")
|
|
|
|
|
try:
|
|
|
|
|
if self.clTempl:
|
|
|
|
|
self.clTempl.closeFiles()
|
|
|
|
@ -1432,7 +1429,7 @@ the system") + " (yes/no)"
|
|
|
|
|
error = "%s\n%s" % (str(error),_("Unmounting error"))
|
|
|
|
|
except KeyboardInterrupt,e:
|
|
|
|
|
pass
|
|
|
|
|
if self.startMessage:
|
|
|
|
|
if error:
|
|
|
|
|
self.printByResult(False)
|
|
|
|
|
if error:
|
|
|
|
|
for line in filter(lambda x: x,str(error).split('\n')):
|
|
|
|
|