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 <richard.purdie@linuxfoundation.org>

diff --git a/lib/bb/methodpool.py b/lib/bb/methodpool.py
index 2fb5d96a3f20bd3dde19ff59e23641de82e83739..8ad23c650bf48bc12419710e65a361e4767d20b4 100644 (file)
--- 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