Bazaar Fast Import

Merge lp:~jelmer/bzr-fastimport/configobj into lp:bzr-fastimport

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

Trivial fix to cope with the fact that newer Debian packages of bzr use the system configobj and don't ship with one in bzrlib.util.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'processors/generic_processor.py'
2--- processors/generic_processor.py 2010-01-28 06:00:31 +0000
3+++ processors/generic_processor.py 2010-02-08 13:28:16 +0000
4@@ -27,7 +27,10 @@
5 )
6 from bzrlib.repofmt import pack_repo
7 from bzrlib.trace import note, mutter
8-import bzrlib.util.configobj.configobj as configobj
9+try:
10+ import bzrlib.util.configobj.configobj as configobj
11+except ImportError:
12+ import configobj
13 from bzrlib.plugins.fastimport import (
14 branch_updater,
15 bzr_commit_handler,

Subscribers

People subscribed via source and target branches