/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: John Arbash Meinel
  • Date: 2009-10-15 20:04:37 UTC
  • mfrom: (4748 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4752.
  • Revision ID: john@arbash-meinel.com-20091015200437-4wweb0t6uzspvv84
Bring in bzr.dev 4748, resolve conflict, update NEWS.

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):
1097
1097
 
1098
1098
    # Is this a final release version? If so, we should suppress warnings
1099
1099
    if bzrlib.version_info[3] == 'final':
1100
 
        suppress_deprecation_warnings(override=False)
 
1100
        suppress_deprecation_warnings(override=True)
1101
1101
    if argv is None:
1102
1102
        argv = osutils.get_unicode_argv()
1103
1103
    else: