~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-20 13:31:00 UTC
  • mto: This revision was merged to the branch mainline in revision 6153.
  • Revision ID: jriddell@canonical.com-20110920133100-kpsomvcnjoxv6n6b
syntax fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
624
624
                if timeout > 0:
625
625
                    msg += '\n' + gettext(
626
626
                             'Will continue to try until %s, unless '
627
 
                             'you press Ctrl-C.')
628
 
                             % deadline_str
 
627
                             'you press Ctrl-C.') % deadline_str
629
628
                msg += '\n' + gettext('See "bzr help break-lock" for more.')
630
629
                self._report_function(msg)
631
630
            if (max_attempts is not None) and (attempt_count >= max_attempts):