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

  • Committer: Andrew Bennetts
  • Date: 2007-10-12 05:26:46 UTC
  • mfrom: (2904 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2906.
  • Revision ID: andrew.bennetts@canonical.com-20071012052646-wl95idld3ijjy714
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/repository.py
165
165
            return FailedSmartServerResponse(('LockContention',))
166
166
        except errors.UnlockableTransport:
167
167
            return FailedSmartServerResponse(('UnlockableTransport',))
 
168
        except errors.LockFailed, e:
 
169
            return FailedSmartServerResponse(('LockFailed',
 
170
                str(e.lock), str(e.why)))
168
171
        repository.leave_lock_in_place()
169
172
        repository.unlock()
170
173
        if token is None: