~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugin.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
160
160
            if getattr(plugins, f, None):
161
161
                mutter('Plugin name %s already loaded', f)
162
162
            else:
163
 
                mutter('add plugin name %s', f)
 
163
                # mutter('add plugin name %s', f)
164
164
                plugin_names.add(f)
165
165
 
166
166
        plugin_names = list(plugin_names)
168
168
        for name in plugin_names:
169
169
            try:
170
170
                plugin_info = imp.find_module(name, [d])
171
 
                mutter('load plugin %r', plugin_info)
 
171
                # mutter('load plugin %r', plugin_info)
172
172
                try:
173
173
                    plugin = imp.load_module('bzrlib.plugins.' + name,
174
174
                                             *plugin_info)
176
176
                finally:
177
177
                    if plugin_info[0] is not None:
178
178
                        plugin_info[0].close()
179
 
 
180
 
                mutter('loaded succesfully')
 
179
                # mutter('loaded succesfully')
181
180
            except KeyboardInterrupt:
182
181
                raise
183
182
            except Exception, e: