Rev 2549: Don't suppress pipe errors for non-display commaneds (Belchenko, #87178) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Jun 25 16:19:34 BST 2007


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

------------------------------------------------------------
revno: 2549
revision-id: pqm at pqm.ubuntu.com-20070625151932-yshsnfirhwggx07b
parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
parent: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 16:19:32 +0100
message:
  Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
    ------------------------------------------------------------
    revno: 2548.1.1
    merged: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
    parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Mon 2007-06-25 10:27:08 -0400
    message:
      Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
=== modified file 'NEWS'
--- a/NEWS	2007-06-25 13:17:32 +0000
+++ b/NEWS	2007-06-25 14:27:08 +0000
@@ -1,5 +1,10 @@
 IN DEVELOPMENT
 
+  BUGFIXES:
+
+    * Do not suppress pipe errors, etc. in non-display commands
+      (Alexander Belchenko, #87178)
+
   IMPROVEMENTS:
 
     * The --lsprof-file option now dumps a text rendering of the profiling

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2007-06-22 03:28:23 +0000
+++ b/bzrlib/commands.py	2007-06-25 14:27:08 +0000
@@ -712,11 +712,7 @@
 
 def run_bzr_catch_errors(argv):
     try:
-        try:
-            return run_bzr(argv)
-        finally:
-            # do this here inside the exception wrappers to catch EPIPE
-            sys.stdout.flush()
+        return run_bzr(argv)
     except (KeyboardInterrupt, Exception), e:
         # used to handle AssertionError and KeyboardInterrupt
         # specially here, but hopefully they're handled ok by the logger now




More information about the bazaar-commits mailing list