diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-14 00:58:25 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-14 00:58:25 -0700 |
| commit | 72a32682e1dcbdc7d7394dbc9b166486442b201a (patch) | |
| tree | 343cc105987d8b1b7e069d7846ea8377667f1447 /pym/_emerge/AbstractEbuildProcess.py | |
| parent | 66c5c20d958193312ab44d2cf2e446d750618200 (diff) | |
| download | portage-72a32682e1dcbdc7d7394dbc9b166486442b201a.tar.gz portage-72a32682e1dcbdc7d7394dbc9b166486442b201a.tar.bz2 portage-72a32682e1dcbdc7d7394dbc9b166486442b201a.zip | |
Make sure PORTAGE_IPC_DAEMON is only in the environment for
appropriate phases (it was leaking into clean/cleanrm from
previous phases.
Diffstat (limited to 'pym/_emerge/AbstractEbuildProcess.py')
| -rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 9 |
1 files changed, 6 insertions, 3 deletions
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) |