diff options
| -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) |