← 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: 2011-08-09 12:34:00 UTC
  • mfrom: (6056.2.5 option-registry)
  • Revision ID: pqm@pqm.ubuntu.com-20110809123400-x521f2j9jkxx8ze2
(vila) Introduce OptionRegistry (Vincent Ladeuil)

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