diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2018-02-01 23:15:27 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-14 15:26:03 +0000 |
| commit | 85fa5ee8254846af269af61c214f81cce4c5b4a8 (patch) | |
| tree | 81731c061adeef58345c604bd7b74ef6ffc6c15c /bitbake/lib/bb/parse/parse_py | |
| parent | f72a121233b0267556859b56611b57215e0b7fbb (diff) | |
| download | poky-85fa5ee8254846af269af61c214f81cce4c5b4a8.tar.gz | |
bitbake: bitbake: parse: fixes for resolve_file()
The resolve_file() calls mark_dependency(), so the one which calls
resolve_file() doesn't need call mark_dependency() again.
(Bitbake rev: 4682571107323a39b42cd9ec8ee67419e7f15acc)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 3 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index f89ad24273..e5039e3bd1 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
| @@ -131,9 +131,6 @@ def handle(fn, d, include): | |||
| 131 | 131 | ||
| 132 | abs_fn = resolve_file(fn, d) | 132 | abs_fn = resolve_file(fn, d) |
| 133 | 133 | ||
| 134 | if include: | ||
| 135 | bb.parse.mark_dependency(d, abs_fn) | ||
| 136 | |||
| 137 | # actual loading | 134 | # actual loading |
| 138 | statements = get_statements(fn, abs_fn, base_name) | 135 | statements = get_statements(fn, abs_fn, base_name) |
| 139 | 136 | ||
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 97aa130431..9d3ebe16f4 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
| @@ -134,9 +134,6 @@ def handle(fn, data, include): | |||
| 134 | abs_fn = resolve_file(fn, data) | 134 | abs_fn = resolve_file(fn, data) |
| 135 | f = open(abs_fn, 'r') | 135 | f = open(abs_fn, 'r') |
| 136 | 136 | ||
| 137 | if include: | ||
| 138 | bb.parse.mark_dependency(data, abs_fn) | ||
| 139 | |||
| 140 | statements = ast.StatementGroup() | 137 | statements = ast.StatementGroup() |
| 141 | lineno = 0 | 138 | lineno = 0 |
| 142 | while True: | 139 | while True: |
