diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 11 |
1 files changed, 7 insertions, 4 deletions
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 | ||
58 | def obtain(fn, data): | 61 | def 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) |