bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/fix-configobj into lp:bzr-builddeb

  1. fix-configobj
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jelmer/bzr-builddeb/fix-configobj
Merge into: lp:bzr-builddeb
Diff against target: 15 lines (+4/-1)
1 file modified
config.py (+4/-1)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/fix-configobj
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+19016@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Trivial patch to use system configobj if bzrlib doesn't include configobj.

Revision history for this message
James Westby (james-w) wrote :

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.py'
2--- config.py 2009-08-18 20:11:05 +0000
3+++ config.py 2010-02-10 14:45:20 +0000
4@@ -20,7 +20,10 @@
5
6 from bzrlib.config import ConfigObj, TreeConfig
7 from bzrlib.trace import mutter, warning
8-from bzrlib.util.configobj.configobj import ParseError
9+try:
10+ from bzrlib.util.configobj.configobj import ParseError
11+except ImportError:
12+ from configobj import ParseError
13
14
15 class SvnBuildPackageMappedConfig(object):

Subscribers

People subscribed via source and target branches