Rev 2136: Prevent the smart server sending cruft over stderr to the client. in file:///home/robertc/source/baz/hpss/

Robert Collins robertc at robertcollins.net
Sat Feb 3 17:37:32 GMT 2007


------------------------------------------------------------
revno: 2136
revision-id: robertc at robertcollins.net-20070203173724-gswe95wx03oqkjum
parent: larstiq at larstiq.dyndns.org-20070203160453-q5llrsq61v1edkld
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sun 2007-02-04 04:37:24 +1100
message:
  Prevent the smart server sending cruft over stderr to the client.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-02-03 10:11:04 +0000
+++ b/bzrlib/builtins.py	2007-02-03 17:37:24 +0000
@@ -3028,7 +3028,16 @@
         else:
             raise errors.BzrCommandError(
                 "bzr serve requires one of --inet or --port")
-        smart_server.serve()
+        # for the duration of this server, no UI output is permitted.
+        # note that this may cause problems with blackbox tests. This should
+        # be changed with care though, as we dont want to use bandwidth sending
+        # progress over stderr to smart server clients!
+        old_factory = ui.ui_factory
+        try:
+            ui.ui_factory = ui.SilentUIFactory()
+            smart_server.serve()
+        finally:
+            ui.ui_factory = old_factory
 
 
 # command-line interpretation helper for merge-related commands



More information about the bazaar-commits mailing list