From c31324b882c42c156dab15d1d90c84b62da3eb4a7adf741179699e40ec844900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Fri, 23 Jul 2021 05:15:31 +0000 Subject: [PATCH] Accepting request 907840 from home:StevenK:branches:devel:openSUSE:Factory:rpmlint - Support multiple rpmlintrc files correctly. OBS-URL: https://build.opensuse.org/request/show/907840 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint-mini?expand=0&rev=142 --- rpmlint-mini.changes | 5 +++++ rpmlint.wrapper | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rpmlint-mini.changes b/rpmlint-mini.changes index e058e58..f3fdf2c 100644 --- a/rpmlint-mini.changes +++ b/rpmlint-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 23 04:55:34 UTC 2021 - Steve Kowalik + +- Support multiple rpmlintrc files correctly. + ------------------------------------------------------------------- Thu Jul 22 15:22:01 UTC 2021 - Martin Liška diff --git a/rpmlint.wrapper b/rpmlint.wrapper index 419ce50..7045023 100644 --- a/rpmlint.wrapper +++ b/rpmlint.wrapper @@ -7,8 +7,7 @@ XDG_CONFIG_HOME="/opt/testing/share" LC_ALL=en_US.utf-8 export PYTHONHOME LD_LIBRARY_PATH LC_ALL XDG_CONFIG_HOME args="" -rpmlintrc=$(ls -1 /home/abuild/rpmbuild/SOURCES/*rpmlintrc 2>/dev/null) -if [ -n "$rpmlintrc" ]; then - args="-r $rpmlintrc" -fi +for rcfile in /home/abuild/rpmbuild/SOURCES/*rpmlintrc ; do + args="$args -r $rcfile " +done exec /opt/testing/bin/rpmlint.real $args --mini-mode $@