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/__init__.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/__init__.py')
-rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 2fc4002db5..5397d57a51 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py | |||
@@ -134,8 +134,9 @@ def resolve_file(fn, d): | |||
134 | if not newfn: | 134 | if not newfn: |
135 | raise IOError(errno.ENOENT, "file %s not found in %s" % (fn, bbpath)) | 135 | raise IOError(errno.ENOENT, "file %s not found in %s" % (fn, bbpath)) |
136 | fn = newfn | 136 | fn = newfn |
137 | else: | ||
138 | mark_dependency(d, fn) | ||
137 | 139 | ||
138 | mark_dependency(d, fn) | ||
139 | if not os.path.isfile(fn): | 140 | if not os.path.isfile(fn): |
140 | raise IOError(errno.ENOENT, "file %s not found" % fn) | 141 | raise IOError(errno.ENOENT, "file %s not found" % fn) |
141 | 142 | ||