[oe-commits] Richard Purdie : base.bbclass: Remove implicit dependency on license. bbclass

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 28c06a32201351894546b3095f80daa84acf7b39
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=28c06a32201351894546b3095f80daa84acf7b39

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Dec  6 11:55:20 2012 +0000

base.bbclass: Remove implicit dependency on license.bbclass

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/base.bbclass |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0ee9d2e..ac97a35 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -486,12 +486,13 @@ python () {
     if license == "INVALID":
         bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn)
 
-    unmatched_license_flag = check_license_flags(d)
-    if unmatched_license_flag:
-        bb.debug(1, "Skipping %s because it has a restricted license not"
-             " whitelisted in LICENSE_FLAGS_WHITELIST" % pn)
-        raise bb.parse.SkipPackage("because it has a restricted license not"
-             " whitelisted in LICENSE_FLAGS_WHITELIST")
+    if bb.data.inherits_class('license', d):
+        unmatched_license_flag = check_license_flags(d)
+        if unmatched_license_flag:
+            bb.debug(1, "Skipping %s because it has a restricted license not"
+                 " whitelisted in LICENSE_FLAGS_WHITELIST" % pn)
+            raise bb.parse.SkipPackage("because it has a restricted license not"
+                 " whitelisted in LICENSE_FLAGS_WHITELIST")
 
     # If we're building a target package we need to use fakeroot (pseudo)
     # in order to capture permissions, owners, groups and special files