/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/fetch_ghosts.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/fetch_ghosts.py
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
import contextlib
20
 
 
 
19
from . import cleanup
21
20
from .branch import Branch
22
21
from .trace import note
23
22
from .errors import NoSuchRevision, BzrCommandError
44
43
 
45
44
    def run(self):
46
45
        lock_other = self.this_branch.base != self.other_branch.base
47
 
        with contextlib.ExitStack() as exit_stack:
 
46
        with cleanup.ExitStack() as exit_stack:
48
47
            exit_stack.enter_context(self.this_branch.lock_write())
49
48
            if lock_other:
50
49
                exit_stack.enter_context(self.other_branch.lock_read())