From: Richard Purdie Date: Thu, 23 May 2013 09:47:45 +0000 (+0100) Subject: methodpool: Conflicting methodnames should be a fatal error X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=acd6d7ffa8813b3b11cad9145e8e614a695ae04a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git methodpool: Conflicting methodnames should be a fatal error When this error occurs, the build should stop, not continue uninterrupted. [YOCTO #4460] Signed-off-by: Richard Purdie --- diff --git a/lib/bb/methodpool.py b/lib/bb/methodpool.py index 2fb5d96a3f2..8ad23c650bf 100644 --- a/lib/bb/methodpool.py +++ b/lib/bb/methodpool.py @@ -50,7 +50,7 @@ def insert_method(modulename, code, fn): if name in ['None', 'False']: continue elif name in _parsed_fns and not _parsed_fns[name] == modulename: - error("The function %s defined in %s was already declared in %s. BitBake has a global python function namespace so shared functions should be declared in a common include file rather than being duplicated, or if the functions are different, please use different function names." % (name, modulename, _parsed_fns[name])) + bb.fatal("The function %s defined in %s was already declared in %s. BitBake has a global python function namespace so shared functions should be declared in a common include file rather than being duplicated, or if the functions are different, please use different function names." % (name, modulename, _parsed_fns[name])) else: _parsed_fns[name] = modulename