diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-25 02:29:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-25 02:29:06 -0700 |
| commit | 2fd76b639d44f3ff3624ed8dbe96d214a42875e5 (patch) | |
| tree | b90f8401dc45cfc9c4934210dcd431ae8c3fcf45 /pym/portage/dbapi/_MergeProcess.py | |
| parent | f3c4a464cc38788a4946de5331c2618c183fccac (diff) | |
| download | portage-2fd76b639d44f3ff3624ed8dbe96d214a42875e5.tar.gz portage-2fd76b639d44f3ff3624ed8dbe96d214a42875e5.tar.bz2 portage-2fd76b639d44f3ff3624ed8dbe96d214a42875e5.zip | |
MergeProcess: separate unmerge output from merge
The unmerge output has been mixed together with the merge output since
commit 7535cabdf2fab76fc55df83643157613dfd66be9 because
dblink._scheduler was set to None. Now it's fixed to produce separate
logs like it used to.
Diffstat (limited to 'pym/portage/dbapi/_MergeProcess.py')
| -rw-r--r-- | pym/portage/dbapi/_MergeProcess.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index 8f61a2fde..5caeef372 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -92,6 +92,10 @@ class MergeProcess(SpawnProcess): # already be opened by the parent process, so we set the # "subprocess" value for use in conditional logging code # involving PORTAGE_LOG_FILE. + if self.settings.get("PORTAGE_BACKGROUND") == "1": + # unmerge phases have separate logs + self.settings["PORTAGE_BACKGROUND_UNMERGE"] = "1" + self.settings.backup_changes("PORTAGE_BACKGROUND_UNMERGE") self.settings["PORTAGE_BACKGROUND"] = "subprocess" self.settings.backup_changes("PORTAGE_BACKGROUND") |