1 files changed, 18 insertions, 10 deletions

diff --git a/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py b/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py
index 9b353634ed..86fa18ebd2 100644
--- a/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py
@@ -185,18 +185,26 @@ def handle(fn, d, include = 0):
             multi = data.getVar('BBCLASSEXTEND', d, 1)
             if multi:
                 based = bb.data.createCopy(d)
+            else:
+                based = d
+            try:
                 finalise(fn, based)
-                darray = {"": based}
-                for cls in multi.split():
-                    pn = data.getVar('PN', d, True)
-                    based = bb.data.createCopy(d)
-                    data.setVar('PN', pn + '-' + cls, based)
-                    inherit([cls], based)
+            except bb.parse.SkipPackage:
+                bb.data.setVar("__SKIPPED", True, based)
+            darray = {"": based}
+
+            for cls in (multi or "").split():
+                pn = data.getVar('PN', d, True)
+                based = bb.data.createCopy(d)
+                data.setVar('PN', pn + '-' + cls, based)
+                inherit([cls], based)
+                try:
                     finalise(fn, based)
-                    darray[cls] = based
-                return darray
-            else:
-                finalise(fn, d)
+                except bb.parse.SkipPackage:
+                    bb.data.setVar("__SKIPPED", True, based)
+                darray[cls] = based
+            return darray
+   
         bbpath.pop(0)
     if oldfile:
         bb.data.setVar("FILE", oldfile, d)