Rev 2799: (mbp) avoid error message when quitting log|less in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Sep 5 07:06:48 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2799
revision-id: pqm at pqm.ubuntu.com-20070905060644-7559hac0lrdw0xjb
parent: pqm at pqm.ubuntu.com-20070905053131-66z87azjvi32lcwu
parent: mbp at sourcefrog.net-20070903025150-42wzybekw9815zbs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-05 07:06:44 +0100
message:
  (mbp) avoid error message when quitting log|less
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
    ------------------------------------------------------------
    revno: 2777.3.1
    merged: mbp at sourcefrog.net-20070903025150-42wzybekw9815zbs
    parent: pqm at pqm.ubuntu.com-20070902233606-wb062d366w5c83uc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 130574-epipe
    timestamp: Mon 2007-09-03 12:51:50 +1000
    message:
      Always ignore EPIPE, EINVAL when flushing stdout/stderr at exit.
      Avoids error message when quitting log|less
=== modified file 'bzr'
--- a/bzr	2007-08-17 05:16:14 +0000
+++ b/bzr	2007-09-03 02:51:50 +0000
@@ -117,7 +117,9 @@
         sys.stderr.flush()
     except IOError, e:
         import errno
-        if sys.platform != 'win32' or e.errno != errno.EINVAL:
+        if e.errno in [errno.EINVAL, errno.EPIPE]:
+            pass
+        else:
             raise
     if bzrlib.trace._trace_file:
         # this is also _bzr_log




More information about the bazaar-commits mailing list