build: Prefer variant default value over family

Update #4468.
2021-07-15 08:06:26 +02:00
parent b6092cb82c
commit 6c1928caed
1 changed files with 4 additions and 4 deletions
--- a/8
+++ b/8
@@ -694,14 +694,14 @@ class OptionItem(Item):

    def default_value(self, variant, family):
        value = self.data["default"]
-        for default in self.data["default-by-family"]:
-            if OptionItem._is_variant(default["families"], family):
-                value = default["value"]
-                break
        for default in self.data["default-by-variant"]:
            if OptionItem._is_variant(default["variants"], variant):
                value = default["value"]
                break
+        for default in self.data["default-by-family"]:
+            if OptionItem._is_variant(default["families"], family):
+                value = default["value"]
+                break
        if value is None:
            return value
        if isinstance(value, list):