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

  • Committer: Martin Pool
  • Date: 2007-10-05 04:43:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071005044317-od7a5i2bi5fp0o4o
Pass back LockFailed from smart server lock methods

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
414
414
            raise errors.LockContention('(remote lock)')
415
415
        elif response[0] == 'UnlockableTransport':
416
416
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
 
417
        elif response[0] == 'LockFailed':
 
418
            raise errors.LockFailed(response[1], response[2])
417
419
        else:
418
420
            raise errors.UnexpectedSmartServerResponse(response)
419
421
 
940
942
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
941
943
        elif response[0] == 'ReadOnlyError':
942
944
            raise errors.ReadOnlyError(self)
 
945
        elif response[0] == 'LockFailed':
 
946
            raise errors.LockFailed(response[1], response[2])
943
947
        else:
944
948
            raise errors.UnexpectedSmartServerResponse(response)
945
949