diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-05 22:20:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-05 22:20:07 -0700 |
| commit | e9ea4bc74f16e6c120fdf9c1926dfcb7de7bd135 (patch) | |
| tree | a18dc9f2e936f799bf91afcf3d554b453f7ac4e4 /pym/portage/dbapi/_MergeProcess.py | |
| parent | 14230dd467c4f0136cb99e83f2d610de166b772b (diff) | |
| download | portage-e9ea4bc74f16e6c120fdf9c1926dfcb7de7bd135.tar.gz portage-e9ea4bc74f16e6c120fdf9c1926dfcb7de7bd135.tar.bz2 portage-e9ea4bc74f16e6c120fdf9c1926dfcb7de7bd135.zip | |
Substitute EventLoop for PollScheduler.
EventLoop suffices for all of these cases. EventLoop(main=False) is
used for thread safety where API consumers may be using threads.
Diffstat (limited to 'pym/portage/dbapi/_MergeProcess.py')
| -rw-r--r-- | pym/portage/dbapi/_MergeProcess.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index 469ba0b3a..bb607d37f 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -116,8 +116,7 @@ class MergeProcess(ForkProcess): blockers = self.blockers() mylink = portage.dblink(self.mycat, self.mypkg, settings=self.settings, treetype=self.treetype, vartree=self.vartree, - blockers=blockers, scheduler=self.scheduler, - pipe=elog_writer_fd) + blockers=blockers, pipe=elog_writer_fd) fd_pipes[elog_writer_fd] = elog_writer_fd self._elog_reg_id = self.scheduler.io_add_watch(elog_reader_fd, self._registered_events, self._elog_output_handler) @@ -166,11 +165,6 @@ class MergeProcess(ForkProcess): portage.output.havecolor = self.settings.get('NOCOLOR') \ not in ('yes', 'true') - # In this subprocess we want mylink._display_merge() to use - # stdout/stderr directly since they are pipes. This behavior - # is triggered when mylink._scheduler is None. - mylink._scheduler = None - # Avoid wastful updates of the vdb cache. self.vartree.dbapi._flush_cache_enabled = False |