[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1402/8267] oe/lib/package: handle shlibs files disappearing



commit b384b724ec51da702ee42ace4c38546fc16f296f
Author: Ross Burton <ross burton intel com>
Date:   Wed Jul 13 15:34:53 2016 +0100

    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>

 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 faa0ab2..02642f2 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -114,7 +114,12 @@ def read_shlib_providers(d):
             m = list_re.match(file)
             if m:
                 dep_pkg = m.group(1)
-                fd = open(os.path.join(dir, file))
+                try:
+                    fd = open(os.path.join(dir, file))
+                except IOError:
+                    # During a build unrelated shlib files may be deleted, so
+                    # handle files disappearing between the listdirs and open.
+                    continue
                 lines = fd.readlines()
                 fd.close()
                 for l in lines:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]