diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-23 10:47:45 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-24 10:34:51 +0100 |
commit | 3c5b9cf15f2034b704f571a75ad102cc57f9a3b6 (patch) | |
tree | e6b9ce9720c56c25c577852a44518113dc45ffcd | |
parent | 56a2b28724cf530eed2b0de23c0e7b2cc5906931 (diff) | |
download | poky-3c5b9cf15f2034b704f571a75ad102cc57f9a3b6.tar.gz |
bitbake: methodpool: Conflicting methodnames should be a fatal error
When this error occurs, the build should stop, not continue uninterrupted.
[YOCTO #4460]
(Bitbake rev: acd6d7ffa8813b3b11cad9145e8e614a695ae04a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/methodpool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/methodpool.py b/bitbake/lib/bb/methodpool.py index 2fb5d96a3f..8ad23c650b 100644 --- a/bitbake/lib/bb/methodpool.py +++ b/bitbake/lib/bb/methodpool.py | |||
@@ -50,7 +50,7 @@ def insert_method(modulename, code, fn): | |||
50 | if name in ['None', 'False']: | 50 | if name in ['None', 'False']: |
51 | continue | 51 | continue |
52 | elif name in _parsed_fns and not _parsed_fns[name] == modulename: | 52 | elif name in _parsed_fns and not _parsed_fns[name] == modulename: |
53 | 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])) | 53 | 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])) |
54 | else: | 54 | else: |
55 | _parsed_fns[name] = modulename | 55 | _parsed_fns[name] = modulename |
56 | 56 | ||