From: Arnout Vandecappelle (Essensium/Mind) Date: Wed, 31 Jul 2019 23:02:20 +0000 (+0200) Subject: utils/checkpackagelib: CommentsMenusPackagesOrder: only apply to top-level X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5603406bd1289d794a336a79da4599e48fd27b2b;p=buildroot.git utils/checkpackagelib: CommentsMenusPackagesOrder: only apply to top-level The CommentsMenusPackagesOrder test is broken in various ways for files other than package/Config.in and package/Config.in.host. Therefore, the script gives bogus errors for various other Config.in files. However, we don't really want to check those other files. Indeed, many of them have a non-alphabetical ordering for good reasons. Therefore, skip the check for files other than package/Config.in and package/Config.in.host. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/251214899 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Jerzy Grzegorek Cc: Yann E. MORIN Acked-by: Yann E. MORIN --- diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index f0edb9993d..7d7567ac67 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -72,6 +72,11 @@ class CommentsMenusPackagesOrder(_CheckFunction): return len(self.state.split('-')) - 1 def check_line(self, lineno, text): + # We only want to force sorting for the top-level menus + if self.filename not in ["package/Config.in", + "package/Config.in.host"]: + return + if text.startswith("comment") or text.startswith("if") or \ text.startswith("menu"):