Fix variant logic for '+'-prefixed board variants

kibom/component.py

@@ -328,21 +328,28 @@ def isFitted(self):
             if opt.lower() in DNF:
                 return False
 
-        # Variants logic
-        opts = check.split(",")
-        for opt in opts:
-            opt = opt.strip()
-            # Any option containing a DNF is not fitted
-            if opt in DNF:
-                return False
-            # Options that start with '-' are explicitly removed from certain configurations
-            if opt.startswith("-") and str(opt[1:]) in self.prefs.pcbConfig:
-                return False
-            # Options that start with '+' are fitted only for certain configurations
-            if opt.startswith("+") and opt[1:] not in self.prefs.pcbConfig:
+        # Variants logic (comma-separated list)
+        opts = [s.strip() for s in check.split(",")]
+        included_configs = set(opt[1:] for opt in opts if opt.startswith("+"))
+        excluded_configs = set(opt[1:] for opt in opts if opt.startswith("-"))
+
+        # Logic here:
+        # - If pcbConfig specifies variant from excluded_configs, component
+        #   is excluded.
+        # - Otherwise, if included_configs is empty, component is included.
+        # - Otherwise, component is included only if pcbConfig specifies
+        #   variant which is a member of included_configs.
+
+        included = True
+        if included_configs:
+            included = False
+        for config in self.prefs.pcbConfig:
+            if config in excluded_configs:
                 return False
-
-        return True
+            if config in included_configs:
+                included = True
+
+        return included
 
     def isFixed(self):
         """ Determine if a component is FIXED or not.