diff options
-rw-r--r-- | src/buildstream/_options/optionarch.py | 2 | ||||
-rw-r--r-- | src/buildstream/_options/optioneltmask.py | 2 | ||||
-rw-r--r-- | src/buildstream/_options/optionenum.py | 9 | ||||
-rw-r--r-- | src/buildstream/_options/optionflags.py | 9 | ||||
-rw-r--r-- | src/buildstream/_options/optionos.py | 2 |
5 files changed, 19 insertions, 5 deletions
diff --git a/src/buildstream/_options/optionarch.py b/src/buildstream/_options/optionarch.py index 3117b8273..e7735eaa2 100644 --- a/src/buildstream/_options/optionarch.py +++ b/src/buildstream/_options/optionarch.py @@ -40,7 +40,7 @@ class OptionArch(OptionEnum): OPTION_TYPE = 'arch' def load(self, node): - super().load(node, allow_default_definition=False) + super().load_special(node, allow_default_definition=False) def load_default_value(self, node): arch = Platform.get_host_arch() diff --git a/src/buildstream/_options/optioneltmask.py b/src/buildstream/_options/optioneltmask.py index 507dc7070..178999fa1 100644 --- a/src/buildstream/_options/optioneltmask.py +++ b/src/buildstream/_options/optioneltmask.py @@ -33,7 +33,7 @@ class OptionEltMask(OptionFlags): def load(self, node): # Ask the parent constructor to disallow value definitions, # we define those automatically only. - super().load(node, allow_value_definitions=False) + super().load_special(node, allow_value_definitions=False) # Here we want all valid elements as possible values, # but we'll settle for just the relative filenames diff --git a/src/buildstream/_options/optionenum.py b/src/buildstream/_options/optionenum.py index f214d779d..889db965c 100644 --- a/src/buildstream/_options/optionenum.py +++ b/src/buildstream/_options/optionenum.py @@ -30,7 +30,14 @@ class OptionEnum(Option): OPTION_TYPE = 'enum' - def load(self, node, allow_default_definition=True): + def __init__(self, name, definition, pool): + self.values = None + super().__init__(name, definition, pool) + + def load(self, node): + self.load_special(node) + + def load_special(self, node, allow_default_definition=True): super().load(node) valid_symbols = OPTION_SYMBOLS + ['values'] diff --git a/src/buildstream/_options/optionflags.py b/src/buildstream/_options/optionflags.py index ba16244ba..eba3a8dd5 100644 --- a/src/buildstream/_options/optionflags.py +++ b/src/buildstream/_options/optionflags.py @@ -30,7 +30,14 @@ class OptionFlags(Option): OPTION_TYPE = 'flags' - def load(self, node, allow_value_definitions=True): + def __init__(self, name, definition, pool): + self.values = None + super().__init__(name, definition, pool) + + def load(self, node): + self.load_special(node) + + def load_special(self, node, allow_value_definitions=True): super().load(node) valid_symbols = OPTION_SYMBOLS + ['default'] diff --git a/src/buildstream/_options/optionos.py b/src/buildstream/_options/optionos.py index 6263a05a2..fcf4552f5 100644 --- a/src/buildstream/_options/optionos.py +++ b/src/buildstream/_options/optionos.py @@ -29,7 +29,7 @@ class OptionOS(OptionEnum): OPTION_TYPE = 'os' def load(self, node): - super().load(node, allow_default_definition=False) + super().load_special(node, allow_default_definition=False) def load_default_value(self, node): return platform.uname().system |