diff options
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 40 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 8 |
2 files changed, 25 insertions, 23 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 1afbc6f294..aaa262d3e2 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -391,26 +391,26 @@ def set_additional_vars(file, d, include): | |||
391 | """Deduce rest of variables, e.g. ${A} out of ${SRC_URI}""" | 391 | """Deduce rest of variables, e.g. ${A} out of ${SRC_URI}""" |
392 | 392 | ||
393 | return | 393 | return |
394 | 394 | # Nothing seems to use this variable | |
395 | # bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file) | 395 | #bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file) |
396 | 396 | ||
397 | # src_uri = data.getVar('SRC_URI', d, 1) | 397 | #src_uri = data.getVar('SRC_URI', d, 1) |
398 | # if not src_uri: | 398 | #if not src_uri: |
399 | # return | 399 | # return |
400 | 400 | ||
401 | # a = (data.getVar('A', d, 1) or '').split() | 401 | #a = (data.getVar('A', d, 1) or '').split() |
402 | 402 | ||
403 | # from bb import fetch | 403 | #from bb import fetch |
404 | # try: | 404 | #try: |
405 | # ud = fetch.init(src_uri.split(), d) | 405 | # ud = fetch.init(src_uri.split(), d) |
406 | # a += fetch.localpaths(d, ud) | 406 | # a += fetch.localpaths(d, ud) |
407 | # except fetch.NoMethodError: | 407 | #except fetch.NoMethodError: |
408 | # pass | 408 | # pass |
409 | # except bb.MalformedUrl,e: | 409 | #except bb.MalformedUrl,e: |
410 | # raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e) | 410 | # raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e) |
411 | # del fetch | 411 | #del fetch |
412 | 412 | ||
413 | # data.setVar('A', " ".join(a), d) | 413 | #data.setVar('A', " ".join(a), d) |
414 | 414 | ||
415 | 415 | ||
416 | # Add us to the handlers list | 416 | # Add us to the handlers list |
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 6a44e28e90..6311e76902 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -70,14 +70,14 @@ def obtain(fn, data): | |||
70 | return localfn | 70 | return localfn |
71 | bb.mkdirhier(dldir) | 71 | bb.mkdirhier(dldir) |
72 | try: | 72 | try: |
73 | ud = bb.fetch.init([fn], data, False) | 73 | bb.fetch.init([fn], data) |
74 | except bb.fetch.NoMethodError: | 74 | except bb.fetch.NoMethodError: |
75 | (type, value, traceback) = sys.exc_info() | 75 | (type, value, traceback) = sys.exc_info() |
76 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: no method: %s" % value) | 76 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: no method: %s" % value) |
77 | return localfn | 77 | return localfn |
78 | 78 | ||
79 | try: | 79 | try: |
80 | bb.fetch.go(data, ud) | 80 | bb.fetch.go(data) |
81 | except bb.fetch.MissingParameterError: | 81 | except bb.fetch.MissingParameterError: |
82 | (type, value, traceback) = sys.exc_info() | 82 | (type, value, traceback) = sys.exc_info() |
83 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: missing parameters: %s" % value) | 83 | bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: missing parameters: %s" % value) |
@@ -181,7 +181,9 @@ def feeder(lineno, s, fn, data): | |||
181 | if val == None: | 181 | if val == None: |
182 | val = groupd["value"] | 182 | val = groupd["value"] |
183 | elif "colon" in groupd and groupd["colon"] != None: | 183 | elif "colon" in groupd and groupd["colon"] != None: |
184 | val = bb.data.expand(groupd["value"], data) | 184 | e = data.createCopy() |
185 | bb.data.update_data(e) | ||
186 | val = bb.data.expand(groupd["value"], e) | ||
185 | elif "append" in groupd and groupd["append"] != None: | 187 | elif "append" in groupd and groupd["append"] != None: |
186 | val = "%s %s" % ((getFunc(groupd, key, data) or ""), groupd["value"]) | 188 | val = "%s %s" % ((getFunc(groupd, key, data) or ""), groupd["value"]) |
187 | elif "prepend" in groupd and groupd["prepend"] != None: | 189 | elif "prepend" in groupd and groupd["prepend"] != None: |