_/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix commandline arg merging, small improvements

Browse source 
Commandline args should be merged with the submodule's config.
Compare config values to None instead of False, so empty lines and False
can be used as values.
This commit is contained in:
Erovia 2020-01-12 11:21:49 +01:00 committed by skullydazed
parent 20290a1cff
commit e7f6e90a22
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/python/milc.py
View file

@ -180,7 +180,7 @@ class ConfigurationSection(Configuration):
"""Returns a config value, pulling from the `user` section as a fallback. """Returns a config value, pulling from the `user` section as a fallback.
This is called when the attribute is accessed either via the get method or through [ ] index. This is called when the attribute is accessed either via the get method or through [ ] index.
""" """
if key in self._config and self._config[key]: if key in self._config and self._config.get(key) is not None:
return self._config[key] return self._config[key]
elif key in self.parent.user: elif key in self.parent.user:
@ -523,7 +523,7 @@ class MILC(object):
exit(1) exit(1)
# Merge this argument into self.config # Merge this argument into self.config
if argument in self.default_arguments: if argument in self.default_arguments[section]:
arg_value = getattr(self.args, argument) arg_value = getattr(self.args, argument)
if arg_value: if arg_value:
self.config[section][argument] = arg_value self.config[section][argument] = arg_value
@ -531,7 +531,7 @@ class MILC(object):
if argument not in self.config[section]: if argument not in self.config[section]:
# Check if the argument exist for this section # Check if the argument exist for this section
arg = getattr(self.args, argument) arg = getattr(self.args, argument)
if arg: if arg is not None:
self.config[section][argument] = arg self.config[section][argument] = arg
self.release_lock() self.release_lock()