From 7d8f54f7bcf8c1b212837c39d9d65a6377988a7e Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 23 Mar 2015 18:40:49 +0100 Subject: [PATCH] checkkconfigsymbols.py: fix sorted output Commit 5000730fd62b ("checkkconfigsymbols.py: make it Git aware") mistakenly removed to print undefined Kconfig symbols in alphabetical order. Furthermore, the script does not print anything anymore when the entire tree is checked (i.e., when no commit is specified). This patch restores the sorted output and adds the missing print for the default case. Additionally, the file lists are now sorted as well which (a) makes it easier to read and (b) makes the output deterministic. Signed-off-by: Valentin Rothberg Signed-off-by: Greg Kroah-Hartman --- scripts/checkkconfigsymbols.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py index ce9ca60808b8a..74086a583d8dd 100755 --- a/scripts/checkkconfigsymbols.py +++ b/scripts/checkkconfigsymbols.py @@ -112,14 +112,15 @@ def main(): undefined_b = check_symbols() # report cases that are present for the commit but not before - for feature in undefined_b: + for feature in sorted(undefined_b): # feature has not been undefined before if not feature in undefined_a: - files = undefined_b.get(feature) + files = sorted(undefined_b.get(feature)) print "%s\t%s" % (feature, ", ".join(files)) # check if there are new files that reference the undefined feature else: - files = undefined_b.get(feature) - undefined_a.get(feature) + files = sorted(undefined_b.get(feature) - + undefined_a.get(feature)) if files: print "%s\t%s" % (feature, ", ".join(files)) @@ -129,8 +130,9 @@ def main(): # default to check the entire tree else: undefined = check_symbols() - for feature in undefined: - files = undefined.get(feature) + for feature in sorted(undefined): + files = sorted(undefined.get(feature)) + print "%s\t%s" % (feature, ", ".join(files)) def execute(cmd): -- 2.39.5