comparison mercurial/dispatch.py @ 6998:ddfcefab8b97

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 06 Sep 2008 17:04:01 +0200
parents 5cf3bf3c19ba b9d012ce8578
children b4c035057d34
comparison
equal deleted inserted replaced
6992:4e62be0208d3 6998:ddfcefab8b97
88 if ui.debugflag: 88 if ui.debugflag:
89 ui.warn(_("\nbroken pipe\n")) 89 ui.warn(_("\nbroken pipe\n"))
90 else: 90 else:
91 raise 91 raise
92 except socket.error, inst: 92 except socket.error, inst:
93 ui.warn(_("abort: %s\n") % inst[1]) 93 ui.warn(_("abort: %s\n") % inst[-1])
94 except IOError, inst: 94 except IOError, inst:
95 if hasattr(inst, "code"): 95 if hasattr(inst, "code"):
96 ui.warn(_("abort: %s\n") % inst) 96 ui.warn(_("abort: %s\n") % inst)
97 elif hasattr(inst, "reason"): 97 elif hasattr(inst, "reason"):
98 try: # usually it is in the form (errno, strerror) 98 try: # usually it is in the form (errno, strerror)