← Back to branch summary

~jr/bzr/i18n-options

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-17 09:36:59 UTC
  • mfrom: (6076 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6082.
  • Revision ID: jelmer@samba.org-20110817093659-gjeempouhga9agnt
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
295
295
        """
296
296
        if (other_holder is not None):
297
297
            if other_holder.is_lock_holder_known_dead():
298
 
                if self.get_config().get_user_option_as_bool(
299
 
                    'locks.steal_dead',
300
 
                    default=False):
 
298
                if self.get_config().get('locks.steal_dead'):
301
299
                    ui.ui_factory.show_user_warning(
302
300
                        'locks_steal_dead',
303
301
                        lock_url=urlutils.join(self.transport.base, self.path),
709
707
        """Get the configuration that governs this lockdir."""
710
708
        # XXX: This really should also use the locationconfig at least, but
711
709
        # that seems a bit hard to hook up at the moment. -- mbp 20110329
712
 
        return config.GlobalConfig()
 
710
        # FIXME: The above is still true ;) -- vila 20110811
 
711
        return config.GlobalStack()
713
712
 
714
713
 
715
714
class LockHeldInfo(object):