Cleanup $T earlier to prevent old messages from being displayed - bug 279041

diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index b9c87f082c23862309bc30073933c0f33726c6e3..adb91aa0063541ee4be95c734c8a3e2af12f7707 100644 (file)
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -40,9 +40,8 @@ class EbuildExecuter(CompositeTask):
                pkg = self.pkg
                scheduler = self.scheduler
                settings = self.settings
-               cleanup = 1
+               cleanup = 0
 
-               # This initializes PORTAGE_LOG_FILE.
                portage.prepare_build_dirs(pkg.root, settings, cleanup)
 
                setup_phase = EbuildPhase(background=self.background,

diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py
index e5d8bf4a85575221bef993b371beb7c22d017dbd..5059e998b68a7a0681652f80786a32b0c6b470f8 100644 (file)
--- a/pym/_emerge/EbuildFetcher.py
+++ b/pym/_emerge/EbuildFetcher.py
@@ -42,7 +42,9 @@ class EbuildFetcher(SpawnProcess):
                        self._build_dir = EbuildBuildDir(pkg=self.pkg, settings=settings)
                        self._build_dir.lock()
                        self._build_dir.clean_log()
-                       portage.prepare_build_dirs(self.pkg.root, self._build_dir.settings, 0)
+                       cleanup=1
+                       # This initializes PORTAGE_LOG_FILE.
+                       portage.prepare_build_dirs(self.pkg.root, self._build_dir.settings, cleanup)
                        if self.logfile is None:
                                self.logfile = settings.get("PORTAGE_LOG_FILE")