summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2018-10-16 07:15:49 +0200
committerUlf Magnusson <ulfalizer@gmail.com>2018-10-16 07:35:53 +0200
commit553985a985c6aa4d5f9119223ac7fe23b83d5b3c (patch)
treece620d25177ce612750189bf433f0240cda4145f
parent796a3459776856c30f73d166b251898cdd4cd375 (diff)
menuconfig: Use Kconfig.unique_choices in jump-to
Use Kconfig.unique_choices instead of Kconfig.choices in the jump-to dialog, as choices defined in multiple locations should only get their menu nodes added once (to avoid redundant entries). I noticed a related Kconfiglib issue while working on this: Kconfig.choices has been identical to Kconfig.unique_choices all long, so things were never actually broken. That means Kconfig.choices should be fixed to match its description though. The next commit will do that.
-rwxr-xr-xmenuconfig.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/menuconfig.py b/menuconfig.py
index accaf6f..3944070 100755
--- a/menuconfig.py
+++ b/menuconfig.py
@@ -2006,7 +2006,8 @@ def _sorted_sc_nodes(cached_nodes=[]):
# Add choice nodes
- choices = sorted(_kconf.choices, key=lambda choice: choice.name or "")
+ choices = sorted(_kconf.unique_choices,
+ key=lambda choice: choice.name or "")
cached_nodes += sorted(
[node