/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/plugins/launchpad/lp_propose.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/launchpad/lp_propose.py
138
138
    def check_proposal(self):
139
139
        """Check that the submission is sensible."""
140
140
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
141
 
            raise errors.BzrCommandError(
 
141
            raise errors.CommandError(
142
142
                'Source and target branches must be different.')
143
143
        for mp in self.source_branch.lp.landing_targets:
144
144
            if mp.queue_status in ('Merged', 'Rejected'):
145
145
                continue
146
146
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
147
 
                raise errors.BzrCommandError(gettext(
 
147
                raise errors.CommandError(gettext(
148
148
                    'There is already a branch merge proposal: %s') %
149
149
                    lp_api.canonical_url(mp))
150
150