Fix cleaning env. Fix break function.

develop
parent 7d1020abd8
commit 86f0b5b69c

@ -317,7 +317,7 @@ class cl_assemble(color_print):
self.printMessageForTest(_("Executing '%s'")%emergeSync) self.printMessageForTest(_("Executing '%s'")%emergeSync)
self.runChroot(emergeSync) self.runChroot(emergeSync)
emergeLayman = "emerge layman" emergeLayman = 'USE="git" emerge layman'
self.printMessageForTest(_("Executing '%s'")%emergeLayman) self.printMessageForTest(_("Executing '%s'")%emergeLayman)
self.runChroot(emergeLayman) self.runChroot(emergeLayman)
@ -554,7 +554,8 @@ class cl_assemble(color_print):
if umountProcess.failed(): if umountProcess.failed():
raise AssembleError(_("Can not umount %s")%target) raise AssembleError(_("Can not umount %s")%target)
self.printByResult(True) self.printByResult(True)
self.targetDistr = PartitionDistributive(rootPartdev,flagRemoveDir=False) self.targetDistr = PartitionDistributive(rootPartdev,
mdirectory='/mnt/builder',flagRemoveDir=False)
dd = DirectoryDistributive(mp,parent=self.targetDistr) dd = DirectoryDistributive(mp,parent=self.targetDistr)
return True return True
@ -774,7 +775,8 @@ class cl_assemble(color_print):
def _cleanEnv(self,assembleEnv): def _cleanEnv(self,assembleEnv):
if not assembleEnv.getAllSectionNames(): if not assembleEnv.getAllSectionNames():
os.unlink(self.assembleEnvFile) os.unlink(self.assembleEnvFile)
elif not self.__sectionName() in assembleEnv.getAllSectionNames(): elif not ",".join(self.__sectionName()) in \
assembleEnv.getAllSectionNames():
assembleEnv.delArea(self.__sectionName()) assembleEnv.delArea(self.__sectionName())
def removeDistroInfo(self): def removeDistroInfo(self):

Loading…
Cancel
Save