diff options
author | Holger Freyther <ich@tamarin.(none)> | 2009-05-17 13:00:42 +0200 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-10 16:32:28 +0000 |
commit | b045ab32227baaec940698dad79aac0e41c5ee8a (patch) | |
tree | a3ea40cbaca9b34b07320029793a0c08db0a952e | |
parent | 7477c0d89a84994f78a1cf1a7ac973bead72073a (diff) | |
download | poky-b045ab32227baaec940698dad79aac0e41c5ee8a.tar.gz |
bitbake: [parse] Move inherit handling to method
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 6cb8d560f2..47502adc3c 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -168,6 +168,11 @@ def handleBBHandlers(m, d): | |||
168 | data.setVarFlag(h, "handler", 1, d) | 168 | data.setVarFlag(h, "handler", 1, d) |
169 | data.setVar('__BBHANDLERS', bbhands, d) | 169 | data.setVar('__BBHANDLERS', bbhands, d) |
170 | 170 | ||
171 | def handleInherit(m, d): | ||
172 | files = m.group(1) | ||
173 | n = __word__.findall(files) | ||
174 | inherit(n, d) | ||
175 | |||
171 | def supports(fn, d): | 176 | def supports(fn, d): |
172 | return fn[-3:] == ".bb" or fn[-8:] == ".bbclass" or fn[-4:] == ".inc" | 177 | return fn[-3:] == ".bb" or fn[-8:] == ".bbclass" or fn[-4:] == ".inc" |
173 | 178 | ||
@@ -376,10 +381,7 @@ def feeder(lineno, s, fn, root, d): | |||
376 | 381 | ||
377 | m = __inherit_regexp__.match(s) | 382 | m = __inherit_regexp__.match(s) |
378 | if m: | 383 | if m: |
379 | 384 | handleInherit(m, d) | |
380 | files = m.group(1) | ||
381 | n = __word__.findall(files) | ||
382 | inherit(n, d) | ||
383 | return | 385 | return |
384 | 386 | ||
385 | from bb.parse import ConfHandler | 387 | from bb.parse import ConfHandler |