Add check detect kernel and initramfs in builder layer

master
Mike Hiretsky 14 years ago
parent bb62bfac26
commit 07b5e8c7dc

@ -241,7 +241,12 @@ class cl_builder(color_print):
return False
elif not self.clVars.Get('os_builder_linux_shortname') in \
varsShare.dictNameSystem.keys():
self.printWARNING("Distributive is not Calculate Linux")
self.printERROR("Distributive is not Calculate Linux")
return False
elif not self.clVars.Get('cl_builder_kernel'):
self.printERROR("Can not detect kernel")
elif not self.clVars.Get('cl_builder_initrd_install'):
self.printERROR("Can not detect initramfs")
return False
elif not rescratch and path.exists(buildDirectory):
self.printWARNING(
@ -256,9 +261,9 @@ class cl_builder(color_print):
sourceDirectory = self.clVars.Get('cl_builder_path')
bindDirectory = pathJoin(buildDirectory,
self.clVars.Get('cl_builder_squash_path'))
self.printInfo()
if not self.checkVariables():
return False
self.printInfo()
self.targetDistr = IsoDistributive(isoFile,bdirectory=buildDirectory)
self.sourceDistr = DirectoryDistributive(sourceDirectory,
mdirectory=bindDirectory)
@ -284,9 +289,9 @@ class cl_builder(color_print):
sourceDirectory = self.clVars.Get('cl_builder_path')
bindDirectory = pathJoin(buildDirectory,
self.clVars.Get('cl_builder_squash_path'))
self.printRescratchInfo()
if not self.checkVariables(rescratch=True):
return False
self.printRescratchInfo()
self.targetDistr = IsoDistributive(buildDirectory,
bdirectory=buildDirectory)
self.sourceDistr = DirectoryDistributive(sourceDirectory,

Loading…
Cancel
Save