From 86f0b5b69c390020a08f322120fa5012a5670c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 27 Oct 2010 11:20:46 +0400 Subject: [PATCH] Fix cleaning env. Fix break function. --- pym/cl_assemble.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py index d220cbf..5d673af 100644 --- a/pym/cl_assemble.py +++ b/pym/cl_assemble.py @@ -317,7 +317,7 @@ class cl_assemble(color_print): self.printMessageForTest(_("Executing '%s'")%emergeSync) self.runChroot(emergeSync) - emergeLayman = "emerge layman" + emergeLayman = 'USE="git" emerge layman' self.printMessageForTest(_("Executing '%s'")%emergeLayman) self.runChroot(emergeLayman) @@ -554,7 +554,8 @@ class cl_assemble(color_print): if umountProcess.failed(): raise AssembleError(_("Can not umount %s")%target) self.printByResult(True) - self.targetDistr = PartitionDistributive(rootPartdev,flagRemoveDir=False) + self.targetDistr = PartitionDistributive(rootPartdev, + mdirectory='/mnt/builder',flagRemoveDir=False) dd = DirectoryDistributive(mp,parent=self.targetDistr) return True @@ -774,7 +775,8 @@ class cl_assemble(color_print): def _cleanEnv(self,assembleEnv): if not assembleEnv.getAllSectionNames(): os.unlink(self.assembleEnvFile) - elif not self.__sectionName() in assembleEnv.getAllSectionNames(): + elif not ",".join(self.__sectionName()) in \ + assembleEnv.getAllSectionNames(): assembleEnv.delArea(self.__sectionName()) def removeDistroInfo(self):