base.bbclass: Correct the test for obsolete license exceptions

Message ID 20220625155225.26081-1-pkj@axis.com
State Accepted, archived
Commit 3ad994d95815eefed2a72b675c7a323b3ed38191
Headers show
Series base.bbclass: Correct the test for obsolete license exceptions | expand

Commit Message

Peter Kjellerstedt June 25, 2022, 3:52 p.m. UTC
The test for obsolete licenses used in INCOMPATIBLE_LICENSE_EXCEPTIONS
tried to match the "<package>:<license>" tuples with the obsolete
licenses and thus never matched anything.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 meta/classes/base.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 20968a5076..cc02de5f77 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -594,9 +594,9 @@  python () {
 
             for lic_exception in exceptions:
                 if ":" in lic_exception:
-                    lic_exception.split(":")[0]
+                    lic_exception = lic_exception.split(":")[1]
                 if lic_exception in oe.license.obsolete_license_list():
-                    bb.fatal("Invalid license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception)
+                    bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception)
 
             pkgs = d.getVar('PACKAGES').split()
             skipped_pkgs = {}