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-09 14:09:00 +0000 |
| commit | 4682571107323a39b42cd9ec8ee67419e7f15acc (patch) | |
| tree | 035742665cc4e5521b0b2220de2e074e9d1b2940 /lib | |
| parent | c8d3a2016f432e8ed9e99d9c28850149ab6fd6d8 (diff) | |
| download | bitbake-4682571107323a39b42cd9ec8ee67419e7f15acc.tar.gz | |
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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/parse/__init__.py | 3 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 3 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/ConfHandler.py | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/lib/bb/parse/__init__.py b/lib/bb/parse/__init__.py index 2fc4002db..5397d57a5 100644 --- a/lib/bb/parse/__init__.py +++ b/lib/bb/parse/__init__.py @@ -134,8 +134,9 @@ def resolve_file(fn, d): if not newfn: raise IOError(errno.ENOENT, "file %s not found in %s" % (fn, bbpath)) fn = newfn + else: + mark_dependency(d, fn) - mark_dependency(d, fn) if not os.path.isfile(fn): raise IOError(errno.ENOENT, "file %s not found" % fn) diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index f89ad2427..e5039e3bd 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -131,9 +131,6 @@ def handle(fn, d, include): abs_fn = resolve_file(fn, d) - if include: - bb.parse.mark_dependency(d, abs_fn) - # actual loading statements = get_statements(fn, abs_fn, base_name) diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py index 97aa13043..9d3ebe16f 100644 --- a/lib/bb/parse/parse_py/ConfHandler.py +++ b/lib/bb/parse/parse_py/ConfHandler.py @@ -134,9 +134,6 @@ def handle(fn, data, include): abs_fn = resolve_file(fn, data) f = open(abs_fn, 'r') - if include: - bb.parse.mark_dependency(data, abs_fn) - statements = ast.StatementGroup() lineno = 0 while True: |