/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.py

  • Committer: Robert Collins
  • Date: 2009-07-22 00:34:44 UTC
  • mfrom: (4555 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4557.
  • Revision ID: robertc@robertcollins.net-20090722003444-vcci9yub1ypc5n6k
Fix NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
897
897
            # We do *not* set self.decoding_failed here.  The message handler
898
898
            # has raised an error, but the decoder is still able to parse bytes
899
899
            # and determine when this message ends.
900
 
            log_exception_quietly()
 
900
            if not isinstance(exception.exc_value, errors.UnknownSmartMethod):
 
901
                log_exception_quietly()
901
902
            self.message_handler.protocol_error(exception.exc_value)
902
903
            # The state machine is ready to continue decoding, but the
903
904
            # exception has interrupted the loop that runs the state machine.