RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

build: Prefer variant default value over family

Browse Source 
Update #4468.
This commit is contained in:
Sebastian Huber
2021-07-15 08:06:26 +02:00
parent b6092cb82c
commit 6c1928caed
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wscript
View File

@@ -694,14 +694,14 @@ class OptionItem(Item):
def default_value(self, variant, family): def default_value(self, variant, family):
value = self.data["default"] 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"]: for default in self.data["default-by-variant"]:
if OptionItem._is_variant(default["variants"], variant): if OptionItem._is_variant(default["variants"], variant):
value = default["value"] value = default["value"]
break break
for default in self.data["default-by-family"]:
if OptionItem._is_variant(default["families"], family):
value = default["value"]
break
if value is None: if value is None:
return value return value
if isinstance(value, list): if isinstance(value, list):