/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/check.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/check.py
36
36
 
37
37
from __future__ import absolute_import
38
38
 
39
 
import contextlib
40
 
 
41
39
from . import (
 
40
    cleanup,
42
41
    errors,
43
42
    )
44
43
from .controldir import ControlDir
102
101
    except errors.NotBranchError:
103
102
        base_tree = branch = repo = None
104
103
 
105
 
    with contextlib.ExitStack() as exit_stack:
 
104
    with cleanup.ExitStack() as exit_stack:
106
105
        needed_refs = {}
107
106
        if base_tree is not None:
108
107
            # If the tree is a lightweight checkout we won't see it in