| 1 |
commit: d365eb3a6187ffcfccd1e68e637698d52e02070b |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 1 20:34:52 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 20:34:52 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d365eb3a |
| 7 |
|
| 8 |
MergeProcess: check if _elog_reader_fd is None |
| 9 |
|
| 10 |
It seems saner to check for None, given that _elog_reader_fd is an int, |
| 11 |
even though it will probably never be zero. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/dbapi/_MergeProcess.py | 2 +- |
| 15 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py |
| 18 |
index c9b6288..df501be 100644 |
| 19 |
--- a/pym/portage/dbapi/_MergeProcess.py |
| 20 |
+++ b/pym/portage/dbapi/_MergeProcess.py |
| 21 |
@@ -212,7 +212,7 @@ class MergeProcess(SpawnProcess): |
| 22 |
if self._elog_reg_id is not None: |
| 23 |
self.scheduler.unregister(self._elog_reg_id) |
| 24 |
self._elog_reg_id = None |
| 25 |
- if self._elog_reader_fd: |
| 26 |
+ if self._elog_reader_fd is not None: |
| 27 |
os.close(self._elog_reader_fd) |
| 28 |
self._elog_reader_fd = None |
| 29 |
if self._elog_keys is not None: |
Archives