← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/codehosting/puller/worker.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-06-03 05:01:52 UTC
  • mfrom: (13081.2.20 newer-bzr)
  • Revision ID: launchpad@pqm.canonical.com-20110603050152-qvu17gaqkvalj1hv
[r=allenap][bug=660790, 670870, 674581, 688459, 691994,
        709539] Update Bazaar to 2.3.3 and bzr-svn, bzr-hg,
        bzr-git and bzr-loom to their current tips.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/codehosting/puller/worker.py
512
512
        SilentUIFactory.__init__(self)
513
513
        self.puller_worker_protocol = puller_worker_protocol
514
514
 
515
 
    def get_boolean(self, prompt):
 
515
    def confirm_action(self, prompt, confirmation_id, args):
516
516
        """If we're asked to break a lock like a stale lock of ours, say yes.
517
517
        """
518
 
        assert prompt.startswith('Break '), (
519
 
            "Didn't expect prompt %r" % (prompt,))
 
518
        assert confirmation_id == 'bzrlib.lockdir.break', \
 
519
            "Didn't expect confirmation id %r" % (confirmation_id,)
520
520
        branch_id = self.puller_worker_protocol.branch_id
 
521
        prompt = prompt % args
521
522
        if get_lock_id_for_branch_id(branch_id) in prompt:
522
523
            return True
523
524
        else: