← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-25 20:51:33 UTC
  • mto: This revision was merged to the branch mainline in revision 2050.
  • Revision ID: john@arbash-meinel.com-20060825205133-402530a133d623a0
Switch the default from instantly aborting, to waiting as long as 1 minute (down from 5 minutes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
130
130
# TODO: Make sure to pass the right file and directory mode bits to all
131
131
# files/dirs created.
132
132
 
133
 
_DEFAULT_TIMEOUT_SECONDS = 300
 
133
_DEFAULT_TIMEOUT_SECONDS = 60
134
134
_DEFAULT_POLL_SECONDS = 0.5
135
135
 
136
136
class LockDir(object):
378
378
 
379
379
    def lock_write(self):
380
380
        """Wait for and acquire the lock."""
381
 
        self.attempt_lock()
 
381
        self.wait_lock()
382
382
 
383
383
    def lock_read(self):
384
384
        """Compatibility-mode shared lock.