Mercurial > hg
comparison mercurial/ui.py @ 16373:329887a7074c
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 06 Apr 2012 15:18:14 -0500 |
parents | ae5f92e154d3 c14898df3b92 |
children | f5dd179bfa4a |
comparison
equal
deleted
inserted
replaced
16371:4417eb761ba8 | 16373:329887a7074c |
---|---|
481 # stderr may be buffered under win32 when redirected to files, | 481 # stderr may be buffered under win32 when redirected to files, |
482 # including stdout. | 482 # including stdout. |
483 if not getattr(self.ferr, 'closed', False): | 483 if not getattr(self.ferr, 'closed', False): |
484 self.ferr.flush() | 484 self.ferr.flush() |
485 except IOError, inst: | 485 except IOError, inst: |
486 if inst.errno not in (errno.EPIPE, errno.EIO): | 486 if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF): |
487 raise | 487 raise |
488 | 488 |
489 def flush(self): | 489 def flush(self): |
490 try: self.fout.flush() | 490 try: self.fout.flush() |
491 except: pass | 491 except: pass |