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/ConfHandler.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/ConfHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 23316ada58..fcbf6aea15 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -47,55 +47,7 @@ def init(data): | |||
47 | 47 | ||
48 | 48 | ||
49 | def supports(fn, d): | 49 | def supports(fn, d): |
50 | return localpath(fn, d)[-5:] == ".conf" | 50 | return fn[-5:] == ".conf" |
51 | |||
52 | def localpath(fn, d): | ||
53 | if os.path.exists(fn): | ||
54 | return fn | ||
55 | |||
56 | if "://" not in fn: | ||
57 | return fn | ||
58 | |||
59 | localfn = None | ||
60 | try: | ||
61 | localfn = bb.fetch.localpath(fn, d, False) | ||
62 | except bb.MalformedUrl: | ||
63 | pass | ||
64 | |||
65 | if not localfn: | ||
66 | return fn | ||
67 | return localfn | ||
68 | |||
69 | def obtain(fn, data): | ||
70 | import sys, bb | ||
71 | fn = bb.data.expand(fn, data) | ||
72 | localfn = bb.data.expand(localpath(fn, data), data) | ||
73 | |||
74 | if localfn != fn: | ||
75 | dldir = bb.data.getVar('DL_DIR', data, 1) | ||
76 | if not dldir: | ||
77 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: DL_DIR not defined") | ||
78 | return localfn | ||
79 | bb.mkdirhier(dldir) | ||
80 | try: | ||
81 | bb.fetch.init([fn], data) | ||
82 | except bb.fetch.NoMethodError: | ||
83 | (type, value, traceback) = sys.exc_info() | ||
84 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: no method: %s" % value) | ||
85 | return localfn | ||
86 | |||
87 | try: | ||
88 | bb.fetch.go(data) | ||
89 | except bb.fetch.MissingParameterError: | ||
90 | (type, value, traceback) = sys.exc_info() | ||
91 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: missing parameters: %s" % value) | ||
92 | return localfn | ||
93 | except bb.fetch.FetchError: | ||
94 | (type, value, traceback) = sys.exc_info() | ||
95 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: failed: %s" % value) | ||
96 | return localfn | ||
97 | return localfn | ||
98 | |||
99 | 51 | ||
100 | def include(oldfn, fn, data, error_out): | 52 | def include(oldfn, fn, data, error_out): |
101 | """ | 53 | """ |
@@ -136,7 +88,6 @@ def handle(fn, data, include = 0): | |||
136 | else: | 88 | else: |
137 | oldfile = bb.data.getVar('FILE', data) | 89 | oldfile = bb.data.getVar('FILE', data) |
138 | 90 | ||
139 | fn = obtain(fn, data) | ||
140 | if not os.path.isabs(fn): | 91 | if not os.path.isabs(fn): |
141 | f = None | 92 | f = None |
142 | bbpath = bb.data.getVar("BBPATH", data, 1) or [] | 93 | bbpath = bb.data.getVar("BBPATH", data, 1) or [] |