/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 bzrlib/plugin.py

  • Committer: Aaron Bentley
  • Date: 2008-11-03 18:59:14 UTC
  • mfrom: (3818 +trunk)
  • mto: (0.16.99 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081103185914-inz25vtsiowydw1p
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
205
205
                    break
206
206
            else:
207
207
                continue
208
 
        if getattr(_mod_plugins, f, None):
 
208
        if f == '__init__':
 
209
            continue # We don't load __init__.py again in the plugin dir
 
210
        elif getattr(_mod_plugins, f, None):
209
211
            trace.mutter('Plugin name %s already loaded', f)
210
212
        else:
211
213
            # trace.mutter('add plugin name %s', f)