Skip to contentSkip to conversation

distro_features_check.bbclass: show all error info at one time

PATCH In review [email protected] 1 participant 4 messages Dec 6, 2018 – Dec 19, 2018

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover distro_features_check.bbclass: show all error info at one time

From: Kai Kang <[email protected]>

The following changes since commit aa93957c8353d222961f08e54fe8d4095dad72c1:

tcl: Upgrade to 8.6.9 (2018-12-05 22:30:19 +0000)

are available in the Git repository at:

git://git.pokylinux.org/poky-contrib kangkai/distro-check
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro-check

Kai Kang (1):
distro_features_check.bbclass: show all error info at one time

 meta/classes/distro_features_check.bbclass | 29 +++++++++-------------
 1 file changed, 12 insertions(+), 17 deletions(-)
Signature · 1 line
2.19.0.rc2
author
#1 lore raw

PATCH 1/1 distro_features_check.bbclass: show all error info at one time

From: Kai Kang <[email protected]>

In distro_features_check.bbclass it checks whether items in REQUIRED_DISTRO_FEATURES and CONFLICT_DISTRO_FEATURES exist in DISTRO_FEATURES. But it only shows one required or conflict distro feature when error occurs. Update to show them all at one time.

Signed-off-by Kai Kang <[email protected]>
---
 meta/classes/distro_features_check.bbclass | 29 +++++++++-------------
 1 file changed, 12 insertions(+), 17 deletions(-)
meta/classes/distro_features_check.bbclass +12 -17
index 9b78b03ef6..eeaa3b44cb 100644
@@ -11,27 +11,22 @@
 
 python () {
     # Assume at least one var is set.
-    distro_features = (d.getVar('DISTRO_FEATURES') or "").split()
+    distro_features = set((d.getVar('DISTRO_FEATURES') or '').split())
 
-    any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES')
+    any_of_distro_features = set((d.getVar('ANY_OF_DISTRO_FEATURES') or '').split())
     if any_of_distro_features:
-        any_of_distro_features = any_of_distro_features.split()
-        if set.isdisjoint(set(any_of_distro_features),set(distro_features)):
-            raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features)
+        if set.isdisjoint(any_of_distro_features, distro_features):
+            raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % ' '.join(any_of_distro_features))
 
-    required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES')
+    required_distro_features = set((d.getVar('REQUIRED_DISTRO_FEATURES') or '').split())
     if required_distro_features:
-        required_distro_features = required_distro_features.split()
-        for f in required_distro_features:
-            if f in distro_features:
-                continue
-            else:
-                raise bb.parse.SkipRecipe("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f)
+        missing = set.difference(required_distro_features, distro_features)
+        if missing:
+            raise bb.parse.SkipRecipe("missing required distro feature%s '%s' (not in DISTRO_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))
 
-    conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES')
+    conflict_distro_features = set((d.getVar('CONFLICT_DISTRO_FEATURES') or '').split())
     if conflict_distro_features:
-        conflict_distro_features = conflict_distro_features.split()
-        for f in conflict_distro_features:
-            if f in distro_features:
-                raise bb.parse.SkipRecipe("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f)
+        conflicts = set.intersection(conflict_distro_features, distro_features)
+        if conflicts:
+            raise bb.parse.SkipRecipe("conflicting distro feature%s '%s' (in DISTRO_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))
 }
Signature · 1 line
2.19.0.rc2
author
#2 lore raw
Quoted 46 lines · On 2018/12/6 下午9:41, [email protected] wrote:

From: Kai Kang <[email protected]>

In distro_features_check.bbclass it checks whether items in REQUIRED_DISTRO_FEATURES and CONFLICT_DISTRO_FEATURES exist in DISTRO_FEATURES. But it only shows one required or conflict distro feature when error occurs. Update to show them all at one time.

Signed-off-by Kai Kang <[email protected]>
---
  meta/classes/distro_features_check.bbclass | 29 +++++++++-------------
  1 file changed, 12 insertions(+), 17 deletions(-)
meta/classes/distro_features_check.bbclass +8 -13
index 9b78b03ef6..eeaa3b44cb 100644
@@ -11,27 +11,22 @@
 
  python () {
      # Assume at least one var is set.
-    distro_features = (d.getVar('DISTRO_FEATURES') or "").split()
+    distro_features = set((d.getVar('DISTRO_FEATURES') or '').split())
 
-    any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES')
+    any_of_distro_features = set((d.getVar('ANY_OF_DISTRO_FEATURES') or '').split())
      if any_of_distro_features:
-        any_of_distro_features = any_of_distro_features.split()
-        if set.isdisjoint(set(any_of_distro_features),set(distro_features)):
-            raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features)
+        if set.isdisjoint(any_of_distro_features, distro_features):
+            raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % ' '.join(any_of_distro_features))
 
-    required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES')
+    required_distro_features = set((d.getVar('REQUIRED_DISTRO_FEATURES') or '').split())
      if required_distro_features:
-        required_distro_features = required_distro_features.split()
-        for f in required_distro_features:
-            if f in distro_features:
-                continue
-            else:
-                raise bb.parse.SkipRecipe("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f)
+        missing = set.difference(required_distro_features, distro_features)
+        if missing:
+            raise bb.parse.SkipRecipe("missing required distro feature%s '%s' (not in DISTRO_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))
 
-    conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES')

meta/classes/distro_features_check.bbclass line 32

Quoted 10 lines
meta/classes/distro_features_check.bbclass +4 -4
+    conflict_distro_features = set((d.getVar('CONFLICT_DISTRO_FEATURES') or '').split())
      if conflict_distro_features:
-        conflict_distro_features = conflict_distro_features.split()
-        for f in conflict_distro_features:
-            if f in distro_features:
-                raise bb.parse.SkipRecipe("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f)
+        conflicts = set.intersection(conflict_distro_features, distro_features)
+        if conflicts:
+            raise bb.parse.SkipRecipe("conflicting distro feature%s '%s' (in DISTRO_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))
  }

Any comment on this patch? Thanks.

Signature · 1 line
Kai Kang
author
#3 lore raw
In reply to [email protected]
Quoted 8 lines · On 2018/12/6 下午9:41, [email protected] wrote:

From: Kai Kang <[email protected]>

The following changes since commit aa93957c8353d222961f08e54fe8d4095dad72c1:

   tcl: Upgrade to 8.6.9 (2018-12-05 22:30:19 +0000)

are available in the Git repository at:

Quoted 9 lines

git://git.pokylinux.org/poky-contrib kangkai/distro-check
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro-check

Kai Kang (1):
distro_features_check.bbclass: show all error info at one time

  meta/classes/distro_features_check.bbclass | 29 +++++++++-------------
  1 file changed, 12 insertions(+), 17 deletions(-)

Ping.

Signature · 1 line
Kai Kang