/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: Alexander Belchenko
  • Date: 2008-04-03 20:51:42 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3337.
  • Revision ID: bialix@ukr.net-20080403205142-7b3q6eh1zhojuy0d
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
212
212
            ## import pdb; pdb.set_trace()
213
213
            if re.search('\.|-| ', name):
214
214
                sanitised_name = re.sub('[-. ]', '_', name)
215
 
                warning("Unable to load %r in %r as a plugin because file path"
216
 
                        " isn't a valid module name; try renaming it to %r."
217
 
                        % (name, d, sanitised_name))
 
215
                if sanitised_name.startswith('bzr_'):
 
216
                    sanitised_name = sanitised_name[len('bzr_'):]
 
217
                warning("Unable to load %r in %r as a plugin because the "
 
218
                        "file path isn't a valid module name; try renaming "
 
219
                        "it to %r." % (name, d, sanitised_name))
218
220
            else:
219
221
                warning('Unable to load plugin %r from %r' % (name, d))
220
222
            log_exception_quietly()