diff options
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 5f8426df24..1afbc6f294 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
| @@ -390,25 +390,27 @@ def vars_from_file(mypkg, d): | |||
| 390 | def set_additional_vars(file, d, include): | 390 | 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 | bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file) | 393 | return |
| 394 | 394 | ||
| 395 | src_uri = data.getVar('SRC_URI', d, 1) | 395 | # bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file) |
| 396 | if not src_uri: | 396 | |
| 397 | return | 397 | # src_uri = data.getVar('SRC_URI', d, 1) |
| 398 | # if not src_uri: | ||
| 399 | # return | ||
| 398 | 400 | ||
| 399 | a = (data.getVar('A', d, 1) or '').split() | 401 | # a = (data.getVar('A', d, 1) or '').split() |
| 400 | 402 | ||
| 401 | from bb import fetch | 403 | # from bb import fetch |
| 402 | try: | 404 | # try: |
| 403 | ud = fetch.init(src_uri.split(), d) | 405 | # ud = fetch.init(src_uri.split(), d) |
| 404 | a += fetch.localpaths(d, ud) | 406 | # a += fetch.localpaths(d, ud) |
| 405 | except fetch.NoMethodError: | 407 | # except fetch.NoMethodError: |
| 406 | pass | 408 | # pass |
| 407 | except bb.MalformedUrl,e: | 409 | # except bb.MalformedUrl,e: |
| 408 | 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) |
| 409 | del fetch | 411 | # del fetch |
| 410 | 412 | ||
| 411 | data.setVar('A', " ".join(a), d) | 413 | # data.setVar('A', " ".join(a), d) |
| 412 | 414 | ||
| 413 | 415 | ||
| 414 | # Add us to the handlers list | 416 | # Add us to the handlers list |
