tools: moveconfig: fix needless move for config with default 1

When moving an integer type option with default value 1, the tool
moves configs with the same value as the default (, and then removed
by the later savedefconfig).  This is a needless operation.

The KconfigParser.parse_one_config() should compare the config after
the "=y -> =1" fixup.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Masahiro Yamada 2016-06-15 14:33:50 +09:00
parent 9f823615af
commit 5030159e27

View file

@ -487,9 +487,6 @@ class KconfigParser:
else:
new_val = not_set
if old_val == new_val:
return (ACTION_NO_CHANGE, new_val)
# If this CONFIG is neither bool nor trisate
if old_val[-2:] != '=y' and old_val[-2:] != '=m' and old_val != not_set:
# tools/scripts/define2mk.sed changes '1' to 'y'.
@ -498,7 +495,8 @@ class KconfigParser:
if new_val[-2:] == '=y':
new_val = new_val[:-1] + '1'
return (ACTION_MOVE, new_val)
return (ACTION_NO_CHANGE if old_val == new_val else ACTION_MOVE,
new_val)
def update_dotconfig(self):
"""Parse files for the config options and update the .config.