diff options
author | Ross Burton <ross.burton@intel.com> | 2016-07-13 15:34:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:47 +0100 |
commit | b384b724ec51da702ee42ace4c38546fc16f296f (patch) | |
tree | ccd95c8ae5047bd55145b6ae993f65a1abf15a37 /meta | |
parent | 72becf96c9bcbcb9b21e5c88125d514afaa2850b (diff) | |
download | poky-b384b724ec51da702ee42ace4c38546fc16f296f.tar.gz |
oe/lib/package: handle shlibs files disappearing
During a parallel build it's possible for unrelated shlib files to be removed if
the recipe they came from is about to be rebuilt. They can't be involved in the
dependency chains as otherwise they wouldn't be removed, so just silently handle
files disappearing.
[ YOCTO #8555 ]
(From OE-Core rev: 1e355da3fda742c78d99ddd2ee5caa9df52f92e1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/package.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index faa0ab2edb..02642f29f0 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py | |||
@@ -114,7 +114,12 @@ def read_shlib_providers(d): | |||
114 | m = list_re.match(file) | 114 | m = list_re.match(file) |
115 | if m: | 115 | if m: |
116 | dep_pkg = m.group(1) | 116 | dep_pkg = m.group(1) |
117 | fd = open(os.path.join(dir, file)) | 117 | try: |
118 | fd = open(os.path.join(dir, file)) | ||
119 | except IOError: | ||
120 | # During a build unrelated shlib files may be deleted, so | ||
121 | # handle files disappearing between the listdirs and open. | ||
122 | continue | ||
118 | lines = fd.readlines() | 123 | lines = fd.readlines() |
119 | fd.close() | 124 | fd.close() |
120 | for l in lines: | 125 | for l in lines: |