← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Martin Pool
  • Date: 2009-03-11 06:26:54 UTC
  • mto: This revision was merged to the branch mainline in revision 4114.
  • Revision ID: mbp@sourcefrog.net-20090311062654-xe3rp86l6npg2m9q
LockContention on OS locks now includes the filename

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1003
1003
 
1004
1004
class LockContention(LockError):
1005
1005
 
1006
 
    _fmt = 'Could not acquire lock "%(lock)s"'
 
1006
    _fmt = 'Could not acquire lock "%(lock)s": %(message)s'
1007
1007
    # TODO: show full url for lock, combining the transport and relative
1008
1008
    # bits?
1009
1009
 
1010
1010
    internal_error = False
1011
1011
 
1012
 
    def __init__(self, lock):
 
1012
    def __init__(self, lock, message=''):
1013
1013
        self.lock = lock
 
1014
        self.message = message
1014
1015
 
1015
1016
 
1016
1017
class LockBroken(LockError):