diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-02-09 17:27:13 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-02-09 17:27:13 -0800 |
| commit | c85b1d7149f09e64b5ed4f5e45742b6e5a9df38b (patch) | |
| tree | 89acfdef9a210a4a179eff28806cb3094362c0e1 /pym/portage/dbapi/_MergeProcess.py | |
| parent | 963fa653fc0d7aff25bb4756df8398b88193547c (diff) | |
| download | portage-c85b1d7149f09e64b5ed4f5e45742b6e5a9df38b.tar.gz portage-c85b1d7149f09e64b5ed4f5e45742b6e5a9df38b.tar.bz2 portage-c85b1d7149f09e64b5ed4f5e45742b6e5a9df38b.zip | |
Use IO_* constants where appropriate.
Diffstat (limited to 'pym/portage/dbapi/_MergeProcess.py')
| -rw-r--r-- | pym/portage/dbapi/_MergeProcess.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index da278ea2a..9bb67c9b6 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import io @@ -10,7 +10,6 @@ import fcntl import portage from portage import os, _unicode_decode import portage.elog.messages -from _emerge.PollConstants import PollConstants from _emerge.SpawnProcess import SpawnProcess class MergeProcess(SpawnProcess): @@ -63,7 +62,7 @@ class MergeProcess(SpawnProcess): def _elog_output_handler(self, fd, event): output = None - if event & PollConstants.POLLIN: + if event & self.scheduler.IO_IN: try: output = os.read(fd, self._bufsize) except OSError as e: @@ -83,7 +82,7 @@ class MergeProcess(SpawnProcess): reporter = getattr(portage.elog.messages, funcname) reporter(msg, phase=phase, key=key, out=out) - if event & PollConstants.POLLHUP: + if event & self.scheduler.IO_HUP: self.scheduler.unregister(self._elog_reg_id) self._elog_reg_id = None os.close(self._elog_reader_fd) |