diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 8 |
1 files changed, 5 insertions, 3 deletions
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: |