/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/commands.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-03 09:46:21 UTC
  • mfrom: (2747.4.1 5454)
  • Revision ID: pqm@pqm.ubuntu.com-20070903094621-g97i8i5qwal4x0er
(dmwatkins) When two plugins conflict, the source of both the losing and now the winning definition is shown, fixing bug #5454.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
85
85
    else:
86
86
        trace.log_error('Two plugins defined the same command: %r' % k)
87
87
        trace.log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
 
88
        trace.log_error('Previously this command was registered from %r' %
 
89
                        sys.modules[plugin_cmds[k_unsquished].__module__])
88
90
 
89
91
 
90
92
def _squish_command_name(cmd):