Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions allnoconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ def main():
# accept 0/1/2, for n/m/y). The assignments will be ignored for other
# symbol types, which is what we want.
kconf.warn = False
for sym in kconf.unique_defined_syms:
sym.set_value(2 if sym.is_allnoconfig_y else 0)
kconf.warn = True
try:
for sym in kconf.unique_defined_syms:
sym.set_value(2 if sym.is_allnoconfig_y else 0)
finally:
kconf.warn = True

kconf.load_allconfig("allno.config")

Expand Down
2 changes: 1 addition & 1 deletion genconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def main():
if args.env_list is not None:
with _open_write(args.env_list) as f:
for env_var in kconf.env_vars:
f.write("{}={}\n".format(env_var, os.environ[env_var]))
f.write("{}={}\n".format(env_var, os.environ.get(env_var, "")))


def _open_write(path):
Expand Down
2 changes: 1 addition & 1 deletion menuconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ def parse_color(color_def):
color_def = color_def.split(":", 1)[1]

# HTML format, #RRGGBB
if re.match("#[A-Fa-f0-9]{6}", color_def):
if re.match("^#[A-Fa-f0-9]{6}$", color_def):
return _color_from_rgb((
int(color_def[1:3], 16),
int(color_def[3:5], 16),
Expand Down
4 changes: 2 additions & 2 deletions testsuite.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def verify_equal(x, y):


def run_tests():
global obsessive, log
global obsessive, obsessive_min_config, log
for s in sys.argv[1:]:
if s == "obsessive":
obsessive = True
Expand Down Expand Up @@ -2379,7 +2379,7 @@ def verify_props(desc, props, prop_names):
verify_props("select", c.syms["MULTIDEF"].selects,
"AA BB CC DD EE FF GG HH II JJ")

verify_props("imply", c.syms["MULTIDEF"].selects,
verify_props("imply", c.syms["MULTIDEF"].implies,
"AA BB CC DD EE FF GG HH II JJ")

verify_props("select", c.syms["MULTIDEF_CHOICE"].selects,
Expand Down