summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse/parse_py
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-03 13:40:52 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-03 13:40:52 +0000
commitbfc70eb24e3ded25007811b1531673fa70b02401 (patch)
treefa4a29290d3178937fa085c147e8a51f815c6fdc /bitbake/lib/bb/parse/parse_py
parent034bbb805be0002fe6d689abde19662868b57b2c (diff)
downloadpoky-bfc70eb24e3ded25007811b1531673fa70b02401.tar.gz
bitbake: Update along 1.8 branch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2345 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py6
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py11
2 files changed, 10 insertions, 7 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 20fa60355e..5f8426df24 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -400,14 +400,14 @@ def set_additional_vars(file, d, include):
400 400
401 from bb import fetch 401 from bb import fetch
402 try: 402 try:
403 fetch.init(src_uri.split(), d) 403 ud = fetch.init(src_uri.split(), d)
404 a += fetch.localpaths(d, ud)
404 except fetch.NoMethodError: 405 except fetch.NoMethodError:
405 pass 406 pass
406 except bb.MalformedUrl,e: 407 except bb.MalformedUrl,e:
407 raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e) 408 raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e)
408
409 a += fetch.localpaths(d)
410 del fetch 409 del fetch
410
411 data.setVar('A', " ".join(a), d) 411 data.setVar('A', " ".join(a), d)
412 412
413 413
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 0e05928d84..6a44e28e90 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -45,14 +45,17 @@ def localpath(fn, d):
45 if os.path.exists(fn): 45 if os.path.exists(fn):
46 return fn 46 return fn
47 47
48 if "://" not in fn:
49 return fn
50
48 localfn = None 51 localfn = None
49 try: 52 try:
50 localfn = bb.fetch.localpath(fn, d) 53 localfn = bb.fetch.localpath(fn, d, False)
51 except bb.MalformedUrl: 54 except bb.MalformedUrl:
52 pass 55 pass
53 56
54 if not localfn: 57 if not localfn:
55 localfn = fn 58 return fn
56 return localfn 59 return localfn
57 60
58def obtain(fn, data): 61def obtain(fn, data):
@@ -67,14 +70,14 @@ def obtain(fn, data):
67 return localfn 70 return localfn
68 bb.mkdirhier(dldir) 71 bb.mkdirhier(dldir)
69 try: 72 try:
70 bb.fetch.init([fn]) 73 ud = bb.fetch.init([fn], data, False)
71 except bb.fetch.NoMethodError: 74 except bb.fetch.NoMethodError:
72 (type, value, traceback) = sys.exc_info() 75 (type, value, traceback) = sys.exc_info()
73 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)
74 return localfn 77 return localfn
75 78
76 try: 79 try:
77 bb.fetch.go(data) 80 bb.fetch.go(data, ud)
78 except bb.fetch.MissingParameterError: 81 except bb.fetch.MissingParameterError:
79 (type, value, traceback) = sys.exc_info() 82 (type, value, traceback) = sys.exc_info()
80 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)