/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/library_state.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-03-22 02:17:16 UTC
  • mfrom: (7498.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200322021716-zt9rlebq0z6asuad
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/381004

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/library_state.py
98
98
        self._trace.__enter__()
99
99
 
100
100
        self._orig_ui = breezy.ui.ui_factory
101
 
        breezy.ui.ui_factory = self._ui
102
 
        self._ui.__enter__()
 
101
        if self._ui is not None:
 
102
            breezy.ui.ui_factory = self._ui
 
103
            self._ui.__enter__()
103
104
 
104
105
        if breezy._global_state is not None:
105
106
            raise RuntimeError("Breezy already initialized")
115
116
        trace._flush_stdout_stderr()
116
117
        trace._flush_trace()
117
118
        osutils.report_extension_load_failures()
118
 
        self._ui.__exit__(None, None, None)
 
119
        if self._ui is not None:
 
120
            self._ui.__exit__(None, None, None)
119
121
        self._trace.__exit__(None, None, None)
120
122
        ui.ui_factory = self._orig_ui
121
123
        breezy._global_state = None