← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

Merge lp:bzr.

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):
1035
1035
            ret = apply_coveraged(opt_coverage_dir, run, *run_argv)
1036
1036
        else:
1037
1037
            ret = run(*run_argv)
1038
 
        if 'memory' in debug.debug_flags:
1039
 
            trace.debug_memory('Process status after command:', short=False)
1040
1038
        return ret or 0
1041
1039
    finally:
1042
1040
        # reset, in case we may do other commands later within the same
1043
1041
        # process. Commands that want to execute sub-commands must propagate
1044
1042
        # --verbose in their own way.
 
1043
        if 'memory' in debug.debug_flags:
 
1044
            trace.debug_memory('Process status after command:', short=False)
1045
1045
        option._verbosity_level = saved_verbosity_level
1046
1046
 
1047
1047
 
1114
1114
        argv = new_argv
1115
1115
    ret = run_bzr_catch_errors(argv)
1116
1116
    trace.mutter("return code %d", ret)
 
1117
    osutils.report_extension_load_failures()
1117
1118
    return ret
1118
1119
 
1119
1120