diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-04-12 22:07:31 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-04-12 22:07:31 +0000 |
| commit | 841e3c400c5c982f17eae23d5cdee9b53d696cf0 (patch) | |
| tree | 3544f74aac6a3852f3571b0085c10bfe72c2c35f /bin/oe/parse | |
| parent | a03720ad5d1012fa6d20bd4467ad453508525301 (diff) | |
| download | bitbake-841e3c400c5c982f17eae23d5cdee9b53d696cf0.tar.gz | |
Auto merged
Diffstat (limited to 'bin/oe/parse')
| -rw-r--r-- | bin/oe/parse/ConfHandler.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/oe/parse/ConfHandler.py b/bin/oe/parse/ConfHandler.py index 1b2fdff17..19c5eb3da 100644 --- a/bin/oe/parse/ConfHandler.py +++ b/bin/oe/parse/ConfHandler.py @@ -86,8 +86,13 @@ def handle(fn, data = {}, include = 0): else: inc_string = "reading" init(data) + if include == 0: oe.data.inheritFromOS(data) + oldfile = None + else: + oldfile = oe.data.getVar('FILE', data) + fn = obtain(fn, data) oepath = ['.'] if not os.path.isabs(fn): @@ -121,6 +126,9 @@ def handle(fn, data = {}, include = 0): lineno = lineno + 1 s = s[:-1] + s2 feeder(lineno, s, fn, data) + + if oldfile: + oe.data.setVar('FILE', oldfile, data) return data def feeder(lineno, s, fn, data = {}): |