From bfc70eb24e3ded25007811b1531673fa70b02401 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 3 Aug 2007 13:40:52 +0000 Subject: bitbake: Update along 1.8 branch git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2345 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py') 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): if os.path.exists(fn): return fn + if "://" not in fn: + return fn + localfn = None try: - localfn = bb.fetch.localpath(fn, d) + localfn = bb.fetch.localpath(fn, d, False) except bb.MalformedUrl: pass if not localfn: - localfn = fn + return fn return localfn def obtain(fn, data): @@ -67,14 +70,14 @@ def obtain(fn, data): return localfn bb.mkdirhier(dldir) try: - bb.fetch.init([fn]) + ud = bb.fetch.init([fn], data, False) except bb.fetch.NoMethodError: (type, value, traceback) = sys.exc_info() bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: no method: %s" % value) return localfn try: - bb.fetch.go(data) + bb.fetch.go(data, ud) except bb.fetch.MissingParameterError: (type, value, traceback) = sys.exc_info() bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: missing parameters: %s" % value) -- cgit v1.2.3-54-g00ecf