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

  • Committer: Andrew Bennetts
  • Date: 2010-05-03 04:08:50 UTC
  • mfrom: (4797.43.8 2.1)
  • mto: This revision was merged to the branch mainline in revision 5199.
  • Revision ID: andrew.bennetts@canonical.com-20100503040850-wm4v7qx6wx3u7ns1
Merge lp:bzr/2.1 into lp:bzr, including fix for #528041.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
429
429
            # It is returned locked, but we need to do the lock to get the lock
430
430
            # token.
431
431
            repo.unlock()
432
 
            repo_lock_token = repo.lock_write().repository_token or ''
 
432
            repo_lock_token = repo.lock_write() or ''
433
433
            if repo_lock_token:
434
434
                repo.leave_lock_in_place()
435
435
            repo.unlock()