diff options
author | Holger Freyther <ich@tamarin.(none)> | 2009-05-17 06:06:14 +0200 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-10 16:31:19 +0000 |
commit | 242a03607d752c228e909a65bf4dfbe8661d5355 (patch) | |
tree | 0a17f345f63f1fc8ee23b20c223b9194540ce21d /bitbake/lib/bb/parse/parse_py/BBHandler.py | |
parent | bf6a4fd658a3c07edd4565c6a139537fa10fd456 (diff) | |
download | poky-242a03607d752c228e909a65bf4dfbe8661d5355.tar.gz |
bitbake: [parser] Kill obtain/localpath from the parser
With obtain it was possible to use an existing fetcher to
download a bb or config file. In practive no one has used it
and it was likely broken in regard to depends_cache... Remove
it for now, simplfiy the code.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 86fa18ebd2..7707705aaf 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -29,7 +29,7 @@ import re, bb, os, sys, time, string | |||
29 | import bb.fetch, bb.build, bb.utils | 29 | import bb.fetch, bb.build, bb.utils |
30 | from bb import data, fetch, methodpool | 30 | from bb import data, fetch, methodpool |
31 | 31 | ||
32 | from ConfHandler import include, localpath, obtain, init | 32 | from ConfHandler import include, init |
33 | from bb.parse import ParseError | 33 | from bb.parse import ParseError |
34 | 34 | ||
35 | __func_start_regexp__ = re.compile( r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" ) | 35 | __func_start_regexp__ = re.compile( r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" ) |
@@ -57,8 +57,7 @@ IN_PYTHON_EOF = -9999999999999 | |||
57 | __parsed_methods__ = methodpool.get_parsed_dict() | 57 | __parsed_methods__ = methodpool.get_parsed_dict() |
58 | 58 | ||
59 | def supports(fn, d): | 59 | def supports(fn, d): |
60 | localfn = localpath(fn, d) | 60 | return fn[-3:] == ".bb" or fn[-8:] == ".bbclass" or fn[-4:] == ".inc" |
61 | return localfn[-3:] == ".bb" or localfn[-8:] == ".bbclass" or localfn[-4:] == ".inc" | ||
62 | 61 | ||
63 | def inherit(files, d): | 62 | def inherit(files, d): |
64 | __inherit_cache = data.getVar('__inherit_cache', d) or [] | 63 | __inherit_cache = data.getVar('__inherit_cache', d) or [] |
@@ -146,7 +145,6 @@ def handle(fn, d, include = 0): | |||
146 | else: | 145 | else: |
147 | oldfile = None | 146 | oldfile = None |
148 | 147 | ||
149 | fn = obtain(fn, d) | ||
150 | bbpath = (data.getVar('BBPATH', d, 1) or '').split(':') | 148 | bbpath = (data.getVar('BBPATH', d, 1) or '').split(':') |
151 | if not os.path.isabs(fn): | 149 | if not os.path.isabs(fn): |
152 | f = None | 150 | f = None |