commit:     91e1dd94c1615bf97d5bc42dac4d64876919e768
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 17:53:40 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed May 11 17:53:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=91e1dd94

qa: gcc-warnings: force text mode w/grep

Newer versions of grep will flag non-ASCII output (e.g. UTF-8 encoded)
as binary when run in the C locale.  Force it into text mode to avoid
that otherwise the QA warning is simply:
 * QA Notice: Package triggers severe warnings which indicate that it
 *            may exhibit random runtime failures.
 * Binary file /var/log/portage/net-fs:netatalk-3.1.8:20160511-173717.log 
matches

 bin/install-qa-check.d/90gcc-warnings | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/install-qa-check.d/90gcc-warnings 
b/bin/install-qa-check.d/90gcc-warnings
index bd82cab..43f9498 100644
--- a/bin/install-qa-check.d/90gcc-warnings
+++ b/bin/install-qa-check.d/90gcc-warnings
@@ -81,8 +81,10 @@ gcc_warn_check() {
                local grep_cmd=grep
                [[ $PORTAGE_LOG_FILE = *.gz ]] && grep_cmd=zgrep
 
-               # force C locale to work around slow unicode locales #160234
-               f=$(LC_CTYPE=C LC_COLLATE=C "${grep_cmd}" -E "${joined_msgs}" 
"${PORTAGE_LOG_FILE}" | uniq)
+               # Force C locale to work around slow multibyte locales. #160234
+               # Force text mode as newer grep will treat non-ASCII (e.g. 
UTF-8) as
+               # binary when we run in the C locale.
+               f=$(LC_CTYPE=C LC_COLLATE=C "${grep_cmd}" -E -a 
"${joined_msgs}" "${PORTAGE_LOG_FILE}" | uniq)
                if [[ -n ${f} ]] ; then
                        abort="yes"
                        # for now, don't make this fatal (see bug #337031)

Reply via email to