← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugin.py

[merge] robertc's integration, updated tests to check for retcode=3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
93
93
    for d in dirs:
94
94
        # going through them one by one allows different plugins with the same
95
95
        # filename in different directories in the path
96
 
        mutter('looking for plugins in %s' % d)
 
96
        mutter('looking for plugins in %s', d)
97
97
        if not d:
98
98
            continue
99
99
        plugin_names = set()
118
118
                        break
119
119
                else:
120
120
                    continue
121
 
            mutter('add plugin name %s' % f)
 
121
            mutter('add plugin name %s', f)
122
122
            plugin_names.add(f)
123
123
 
124
124
        plugin_names = list(plugin_names)
126
126
        for name in plugin_names:
127
127
            try:
128
128
                plugin_info = imp.find_module(name, [d])
129
 
                mutter('load plugin %r' % (plugin_info,))
 
129
                mutter('load plugin %r', plugin_info)
130
130
                try:
131
131
                    plugin = imp.load_module('bzrlib.plugins.' + name,
132
132
                                             *plugin_info)