[gnome-continuous-yocto/gnomeostree-3.28-rocko: 207/218] checklayer: remove reference to undefined class



commit 9e5d96c2abe4e2210355ab9e9b9efce0a9f91228
Author: Anuj Mittal <anuj mittal intel com>
Date:   Thu Mar 15 13:59:51 2018 +0800

    checklayer: remove reference to undefined class
    
    LayerError doesn't exist and will lead to an error when this failure
    code path is hit.
    
    (From OE-Core rev: 7780482772d005c77825dc3e99e63f00911156bf)
    
    (From OE-Core rev: d06cf17109a2ca310c270ce4a27a15cb6190e2ff)
    
    Signed-off-by: Anuj Mittal <anuj mittal intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/checklayer/__init__.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py
index 6395261..288c457 100644
--- a/scripts/lib/checklayer/__init__.py
+++ b/scripts/lib/checklayer/__init__.py
@@ -42,8 +42,8 @@ def _get_layer_collections(layer_path, lconf=None, data=None):
     ldata.setVar('LAYERDIR', layer_path)
     try:
         ldata = bb.parse.handle(lconf, ldata, include=True)
-    except BaseException as exc:
-        raise LayerError(exc)
+    except:
+        raise RuntimeError("Parsing of layer.conf from layer: %s failed" % layer_path)
     ldata.expandVarref('LAYERDIR')
 
     collections = (ldata.getVar('BBFILE_COLLECTIONS') or '').split()


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