/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-07-28 02:47:10 UTC
  • mfrom: (7519.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200728024710-a2ylds219f1lsl62
Merge lp:brz/3.1.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/launchpad/lp_propose.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
17
from ... import (
20
18
    errors,
21
19
    hooks,
140
138
    def check_proposal(self):
141
139
        """Check that the submission is sensible."""
142
140
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
143
 
            raise errors.BzrCommandError(
 
141
            raise errors.CommandError(
144
142
                'Source and target branches must be different.')
145
143
        for mp in self.source_branch.lp.landing_targets:
146
144
            if mp.queue_status in ('Merged', 'Rejected'):
147
145
                continue
148
146
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
149
 
                raise errors.BzrCommandError(gettext(
 
147
                raise errors.CommandError(gettext(
150
148
                    'There is already a branch merge proposal: %s') %
151
149
                    lp_api.canonical_url(mp))
152
150