From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 14 Aug 2010 07:58:25 +0000 (-0700)
Subject: Make sure PORTAGE_IPC_DAEMON is only in the environment for
X-Git-Tag: v2.2_rc68~221
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72a32682e1dcbdc7d7394dbc9b166486442b201a;p=portage.git

Make sure PORTAGE_IPC_DAEMON is only in the environment for
appropriate phases (it was leaking into clean/cleanrm from
previous phases.
---

diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py
index 964095b2a..138430670 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -33,10 +33,10 @@ class AbstractEbuildProcess(SpawnProcess):
 
 	def _start(self):
 
+		envs = [self.settings]
+		if self.env is not None:
+			envs.append(self.env)
 		if self._get_phase() not in self._phases_without_builddir:
-			envs = [self.settings]
-			if self.env is not None:
-				envs.append(self.env)
 			for env in envs:
 				env['PORTAGE_IPC_DAEMON'] = "1"
 			self._exit_command = ExitCommand()
@@ -56,6 +56,9 @@ class AbstractEbuildProcess(SpawnProcess):
 				output_fifo=output_fifo,
 				scheduler=self.scheduler)
 			self._ipc_daemon.start()
+		else:
+			for env in envs:
+				env.pop('PORTAGE_IPC_DAEMON', None)
 
 		SpawnProcess._start(self)