From 63d0867faac7248fe499ba76b4460e1c451683e1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 2 Jun 2011 19:35:05 -0700 Subject: dblink.unmerge: init log_path earlier, don't pop There's no need to pop PORTAGE_LOG_FILE here, since PORTAGE_BACKGROUND=subprocess disables logging when necessary. --- pym/portage/dbapi/vartree.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e742358dc..3c7e9345f 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1619,7 +1619,7 @@ class dblink(object): DeprecationWarning, stacklevel=2) background = False - log_path = None + log_path = self.settings.get("PORTAGE_LOG_FILE") if self._scheduler is None: # We create a scheduler instance and use it to # log unmerge output separately from merge output. @@ -1629,9 +1629,6 @@ class dblink(object): self.settings["PORTAGE_BACKGROUND"] = "1" self.settings.backup_changes("PORTAGE_BACKGROUND") background = True - else: - # Our output is redirected and logged by the parent process. - log_path = self.settings.pop("PORTAGE_LOG_FILE", None) elif self.settings.get("PORTAGE_BACKGROUND") == "1": background = True -- cgit v1.2.3-1-g7c22