bzr-pipeline

Merge lp:~jelmer/bzr-pipeline/missing-lplib into lp:bzr-pipeline

  1. missing-lplib
  2. Merge into trunk
Proposed by Jelmer Vernooij on 2010-05-23
Status: Merged
Merged at revision: 180
Proposed branch: lp:~jelmer/bzr-pipeline/missing-lplib
Merge into: lp:bzr-pipeline
Diff against target: 21 lines (+2/-2)
1 file modified
__init__.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/bzr-pipeline/missing-lplib
Reviewer Review Type Date Requested Status
Aaron Bentley 2010-05-23 Pending
Review via email: mp+25843@code.launchpad.net

Description of the Change

Hi Aaron,

This trivial fix makes it possible to still use bzr-pipeline when launchpadlib is not available, as the launchpad plugin in Bazaar will raise DependencyNotPresent rather than ImprotError when launchpadlib is missing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2010-04-24 04:37:09 +0000
3+++ __init__.py 2010-05-23 15:20:46 +0000
4@@ -106,7 +106,7 @@
5
6
7 import bzrlib
8-from bzrlib import api
9+from bzrlib import api, errors
10 from bzrlib.commands import plugin_cmds
11 from bzrlib.directory_service import AliasDirectory, directories
12
13@@ -160,7 +160,7 @@
14 try:
15 from bzrlib.plugins.launchpad import lp_api
16 from bzrlib.plugins.launchpad import lp_propose
17-except ImportError:
18+except (ImportError, errors.DependencyNotPresent):
19 pass
20 else:
21 def get_prerequisite_from_pipe(hook_params):

Subscribers

People subscribed via source and target branches