diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 9 | ||||
| -rw-r--r-- | pym/_emerge/EbuildSpawnProcess.py | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index 138430670..416babcfb 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -33,12 +33,8 @@ 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: - for env in envs: - env['PORTAGE_IPC_DAEMON'] = "1" + self.settings['PORTAGE_IPC_DAEMON'] = "1" self._exit_command = ExitCommand() self._exit_command.reply_hook = self._exit_command_callback input_fifo = os.path.join( @@ -57,8 +53,7 @@ class AbstractEbuildProcess(SpawnProcess): scheduler=self.scheduler) self._ipc_daemon.start() else: - for env in envs: - env.pop('PORTAGE_IPC_DAEMON', None) + self.settings.pop('PORTAGE_IPC_DAEMON', None) SpawnProcess._start(self) diff --git a/pym/_emerge/EbuildSpawnProcess.py b/pym/_emerge/EbuildSpawnProcess.py index d8087576a..dd12b74e9 100644 --- a/pym/_emerge/EbuildSpawnProcess.py +++ b/pym/_emerge/EbuildSpawnProcess.py @@ -15,4 +15,4 @@ class EbuildSpawnProcess(AbstractEbuildProcess): __slots__ = ('fakeroot_state', 'spawn_func') def _spawn(self, args, **kwargs): - return self.spawn_func(args, **kwargs) + return self.spawn_func(args, env=self.settings.environ(), **kwargs) |