summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Variables/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/SCons/Variables/__init__.py')
-rw-r--r--src/engine/SCons/Variables/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py
index 805471a..f203677 100644
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -95,6 +95,12 @@ class Variables:
option.converter = converter
self.options.append(option)
+
+ # options might be added after the 'unknown' dict has been set up,
+ # so we remove the key and all its aliases from that dict
+ for alias in list(option.aliases) + [ option.key ]:
+ if alias in self.unknown:
+ del self.unknown[alias]
def keys(self):
"""
@@ -179,7 +185,7 @@ class Variables:
for arg, value in args.items():
added = False
for option in self.options:
- if arg in option.aliases + [ option.key ]:
+ if arg in list(option.aliases) + [ option.key ]:
values[option.key] = value
added = True
if not added: