[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4990/8267] base.bbclass: improve wording when skipping recipes with incompatible licenses



commit b41e1c92099fb29f8db76cf6501e5d02a456630c
Author: Andre McCurdy <armccurdy gmail com>
Date:   Fri Mar 3 21:11:12 2017 -0800

    base.bbclass: improve wording when skipping recipes with incompatible licenses
    
    The previous wording, e.g.
    
      ERROR: wget was skipped: incompatible with license GPLv3
    
    isn't very clear and could be taken to imply that the recipe is
    incompatible with its own license.
    
    (From OE-Core rev: c2047067daadb40ff3a944f380c10b2a56b8e080)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index edac18b..14293f8 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -533,7 +533,7 @@ python () {
                         bb.debug(1, "INCLUDING the package " + pkg)
                 elif all_skipped or incompatible_license(d, bad_licenses):
                     bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license))
-                    raise bb.parse.SkipPackage("incompatible with license %s" % license)
+                    raise bb.parse.SkipPackage("it has an incompatible license: %s" % license)
             elif pn in whitelist:
                 if pn in incompatwl:
                     bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has 
been whitelisted")


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