|
|
@ -196,12 +196,11 @@ class Install(color_print):
|
|
|
|
cltFilter=False,
|
|
|
|
cltFilter=False,
|
|
|
|
printSUCCESS=self.printSUCCESS,
|
|
|
|
printSUCCESS=self.printSUCCESS,
|
|
|
|
printWARNING=self.printWARNING,
|
|
|
|
printWARNING=self.printWARNING,
|
|
|
|
|
|
|
|
askConfirm=self.askConfirm,
|
|
|
|
printERROR=self.printERROR)
|
|
|
|
printERROR=self.printERROR)
|
|
|
|
|
|
|
|
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
if self.clTempl.getWarning():
|
|
|
|
|
|
|
|
self.printWARNING(self.clTempl.getWarning())
|
|
|
|
|
|
|
|
if self.clTempl.getError():
|
|
|
|
if self.clTempl.getError():
|
|
|
|
self.printERROR(self.clTempl.getError())
|
|
|
|
self.printERROR(self.clTempl.getError())
|
|
|
|
return False
|
|
|
|
return False
|
|
|
@ -216,7 +215,11 @@ class Install(color_print):
|
|
|
|
self.clVars.Set("cl_chroot_grub","/", True)
|
|
|
|
self.clVars.Set("cl_chroot_grub","/", True)
|
|
|
|
self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
self.clTempl = ProgressTemplate(self.setProgress,self.clVars,
|
|
|
|
self.clTempl = ProgressTemplate(self.setProgress,self.clVars,
|
|
|
|
cltObj=False)
|
|
|
|
cltObj=False,
|
|
|
|
|
|
|
|
printSUCCESS=self.printSUCCESS,
|
|
|
|
|
|
|
|
printWARNING=self.printWARNING,
|
|
|
|
|
|
|
|
askConfirm=self.askConfirm,
|
|
|
|
|
|
|
|
printERROR=self.printERROR)
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
if self.clTempl.getError():
|
|
|
|
if self.clTempl.getError():
|
|
|
|
raise InstallError(self.clTempl.getError())
|
|
|
|
raise InstallError(self.clTempl.getError())
|
|
|
@ -236,6 +239,7 @@ class Install(color_print):
|
|
|
|
cltFilter=False,
|
|
|
|
cltFilter=False,
|
|
|
|
printSUCCESS=self.printSUCCESS,
|
|
|
|
printSUCCESS=self.printSUCCESS,
|
|
|
|
printWARNING=self.printWARNING,
|
|
|
|
printWARNING=self.printWARNING,
|
|
|
|
|
|
|
|
askConfirm=self.askConfirm,
|
|
|
|
printERROR=self.printERROR)
|
|
|
|
printERROR=self.printERROR)
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
if self.clTempl.getError():
|
|
|
|
if self.clTempl.getError():
|
|
|
|