diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-09-30 20:46:17 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-09-30 20:46:17 +0000 |
| commit | 221ac2b25f544a500869667d8f95c6c12c80db1a (patch) | |
| tree | cb14f631faeb933c4dc0e52aee2c1b383bb2da4d /bitbake/lib/bb/parse/parse_py/ConfHandler.py | |
| parent | dc98b2c28c0a7a7ea715230a234bb846a18e4584 (diff) | |
| download | poky-221ac2b25f544a500869667d8f95c6c12c80db1a.tar.gz | |
bitbake/bitbake-dev: Sync with upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5346 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index e6488bbe11..f8a49689e2 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
| @@ -118,7 +118,6 @@ def handle(fn, data, include = 0): | |||
| 118 | init(data) | 118 | init(data) |
| 119 | 119 | ||
| 120 | if include == 0: | 120 | if include == 0: |
| 121 | bb.data.inheritFromOS(data) | ||
| 122 | oldfile = None | 121 | oldfile = None |
| 123 | else: | 122 | else: |
| 124 | oldfile = bb.data.getVar('FILE', data) | 123 | oldfile = bb.data.getVar('FILE', data) |