← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-04 18:51:39 UTC
  • mfrom: (2961.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
Authentication ring implementation (read-only)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
128
128
        )
129
129
from bzrlib.trace import mutter, note
130
130
from bzrlib.transport import Transport
131
 
from bzrlib.osutils import rand_chars, format_delta, get_host_name
 
131
from bzrlib.osutils import rand_chars, format_delta
132
132
from bzrlib.rio import read_stanza, Stanza
133
133
import bzrlib.ui
134
134
 
167
167
        :param path: Path to the lock within the base directory of the 
168
168
            transport.
169
169
        """
 
170
        assert isinstance(transport, Transport), \
 
171
            ("not a transport: %r" % transport)
170
172
        self.transport = transport
171
173
        self.path = path
172
174
        self._lock_held = False
415
417
        try:
416
418
            info = self._read_info_file(self._held_info_path)
417
419
            self._trace("peek -> held")
 
420
            assert isinstance(info, dict), \
 
421
                    "bad parse result %r" % info
418
422
            return info
419
423
        except NoSuchFile, e:
420
424
            self._trace("peek -> not held")
422
426
    def _prepare_info(self):
423
427
        """Write information about a pending lock to a temporary file.
424
428
        """
 
429
        import socket
425
430
        # XXX: is creating this here inefficient?
426
431
        config = bzrlib.config.GlobalConfig()
427
432
        try:
428
433
            user = config.user_email()
429
434
        except errors.NoEmailInUsername:
430
435
            user = config.username()
431
 
        s = Stanza(hostname=get_host_name(),
 
436
        s = Stanza(hostname=socket.gethostname(),
432
437
                   pid=str(os.getpid()),
433
438
                   start_time=str(int(time.time())),
434
439
                   nonce=self.nonce,
505
510
                if deadline_str is None:
506
511
                    deadline_str = time.strftime('%H:%M:%S',
507
512
                                                 time.localtime(deadline))
508
 
                lock_url = self.transport.abspath(self.path)
509
513
                self._report_function('%s %s\n'
510
514
                                      '%s\n' # held by
511
515
                                      '%s\n' # locked ... ago
512
 
                                      'Will continue to try until %s, unless '
513
 
                                      'you press Ctrl-C\n'
514
 
                                      'If you\'re sure that it\'s not being '
515
 
                                      'modified, use bzr break-lock %s',
 
516
                                      'Will continue to try until %s\n',
516
517
                                      start,
517
518
                                      formatted_info[0],
518
519
                                      formatted_info[1],
519
520
                                      formatted_info[2],
520
 
                                      deadline_str,
521
 
                                      lock_url)
 
521
                                      deadline_str)
522
522
 
523
523
            if (max_attempts is not None) and (attempt_count >= max_attempts):
524
524
                self._trace("exceeded %d attempts")