Message ID | SN4P221MB06824359D91BC284DDF6F0A2A0689@SN4P221MB0682.NAMP221.PROD.OUTLOOK.COM |
---|---|
State | Changes Requested |
Headers | show |
Series | support ignore-indent for check-package configs | expand |
diff --git a/package/Config.in b/package/Config.in index eaac32a01af363936edc8a0a8dd2450c458a38ae..9b7899c8da6e98353fba8a360f56df8a4a191b95 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1,3 +1,5 @@ +# noqa: ignore-indent + menu "Target packages" source "package/busybox/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1b0f2799c37dcc70b9e6c1203c4cccd..ab76d2aebc05abd18448336777f8d1b5b439edb8 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -1,3 +1,5 @@ +# noqa: ignore-indent + menu "Host utilities" source "package/abootimg/Config.in.host" diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 7bd8bc2943d4719b1af4f634d729ae0ae5c50e92..8befa9b6cdcebcf71c06c9e153fabfc776cdb2cf 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -1,3 +1,5 @@ +# noqa: ignore-indent + config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 4de8922e0d505431181d1df4473c54660311552e..80f25fa94b106f41563727c5fe2de18f110ededc 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -1,3 +1,5 @@ +# noqa: ignore-indent + menuconfig BR2_PACKAGE_XORG7 bool "X.org X Window System" depends on BR2_USE_WCHAR diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 52539d97ab60664d0466b42e28b3aac5577db5fb..7aa4c535a6814fd479b3cfdc44c6cb10e53aa70f 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -226,12 +226,6 @@ class Indent(_CheckFunction): if not text.startswith(entry): if state and 'ignore-indent' in state.noqa_flags: return - # four Config.in files have a special but legitimate indentation rule - if self.filename in ["package/Config.in", - "package/Config.in.host", - "package/kodi/Config.in", - "package/x11r7/Config.in"]: - return return ["{}:{}: should not be indented" .format(self.filename, lineno), text]
Applies the `ignore-indent` flag to multiple configuration files, allowing these special files to removed from an internal list managed inside `checkpackagelib/lib_config.py`. Signed-off-by: James Knight <james.d.knight@live.com> --- package/Config.in | 2 ++ package/Config.in.host | 2 ++ package/kodi/Config.in | 2 ++ package/x11r7/Config.in | 2 ++ utils/checkpackagelib/lib_config.py | 6 ------ 5 files changed, 8 insertions(+), 6 deletions(-)