/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/request.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 02:06:05 UTC
  • mto: This revision was merged to the branch mainline in revision 4573.
  • Revision ID: andrew.bennetts@canonical.com-20090727020605-s7v27rmvdf0v593f
More conservative fix for LockContention serialisation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
398
398
    elif isinstance(err, errors.TokenMismatch):
399
399
        return ('TokenMismatch', err.given_token, err.lock_token)
400
400
    elif isinstance(err, errors.LockContention):
401
 
        return ('LockContention', repr(err.lock), err.msg)
 
401
        return ('LockContention',)
402
402
    # Unserialisable error.  Log it, and return a generic error
403
403
    trace.log_exception_quietly()
404
404
    return ('error', str(err))