diff options
| author |   Otavio Pontes <otaviobp@gmail.com> | 2010-08-10 00:20:43 +0000 |
|---|---|---|
| committer | Otavio Pontes <otaviobp@gmail.com> | 2010-08-10 00:20:43 +0000 |
| commit | d37836e51ef63963dc56a30eedae521b29cbadd9 (patch) | |
| tree | 20955e89ab24ad94ed94ddb6309b2a7fdf5d5208 /pym/portage/util/_pty.py | |
| parent | Revert "Fixing portage bug. If more than one line in package.license is used ... (diff) | |
| parent | Fix /etc/portage/package.keywords handling so that more specific (diff) | |
| download | portage-multirepo-d37836e51ef63963dc56a30eedae521b29cbadd9.tar.gz portage-multirepo-d37836e51ef63963dc56a30eedae521b29cbadd9.tar.bz2 portage-multirepo-d37836e51ef63963dc56a30eedae521b29cbadd9.zip | |
Merge branch 'master' of git://git.overlays.gentoo.org/proj/portage
Conflicts:
pym/_emerge/depgraph.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/getmaskingstatus.py
Diffstat (limited to 'pym/portage/util/_pty.py')
| -rw-r--r-- | pym/portage/util/_pty.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py index 7fba0e2b..877430e9 100644 --- a/pym/portage/util/_pty.py +++ b/pym/portage/util/_pty.py @@ -95,10 +95,7 @@ def _test_pty_eof(): buf = array.array('B') try: buf.fromfile(master_file, 1024) - except EOFError: - eof = True - except IOError: - # This is where data loss occurs. + except (EOFError, IOError): eof = True if not buf: |