changeset 1350:3729e2773cca

Fix pipe error regression
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Sep 2005 14:01:18 -0700
parents c6295d2a361e
children 0e2be889ccd7
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Sep 26 14:01:05 2005 -0700
+++ b/mercurial/commands.py	Mon Sep 26 14:01:18 2005 -0700
@@ -2174,11 +2174,11 @@
             u.warn("abort: %s\n" % inst)
         elif hasattr(inst, "reason"):
             u.warn("abort: error: %s\n" % inst.reason[1])
-        elif getattr(inst, "strerror", None):
-            u.warn("abort: %s\n" % inst.strerror)
         elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
             if u.debugflag:
                 u.warn("broken pipe\n")
+        elif getattr(inst, "strerror", None):
+            u.warn("abort: %s\n" % inst.strerror)
         else:
             raise
     except OSError, inst: