← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-23 06:54:14 UTC
  • mfrom: (4695.5.9 remove-logging)
  • Revision ID: pqm@pqm.ubuntu.com-20090923065414-vue8c7speunw9wbq
(mbp) deprecate trace.info, error, show_error

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
101
101
            registry.Registry.register(self, k_unsquished, cmd,
102
102
                                       override_existing=decorate, info=info)
103
103
        except KeyError:
104
 
            trace.log_error('Two plugins defined the same command: %r' % k)
105
 
            trace.log_error('Not loading the one in %r' %
106
 
                            sys.modules[cmd.__module__])
107
 
            trace.log_error('Previously this command was registered from %r' %
108
 
                            sys.modules[previous.__module__])
 
104
            trace.warning('Two plugins defined the same command: %r' % k)
 
105
            trace.warning('Not loading the one in %r' %
 
106
                sys.modules[cmd.__module__])
 
107
            trace.warning('Previously this command was registered from %r' %
 
108
                sys.modules[previous.__module__])
109
109
        return previous
110
110
 
111
111
    def register_lazy(self, command_name, aliases, module_name):