[commit: ghc] ghc-8.4: Only look for locales of the form LL.VV (c384029)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.4
Link       : http://ghc.haskell.org/trac/ghc/changeset/c384029ae415b9d2b8843eb1d0e399862dc6a576/ghc

>---------------------------------------------------------------

commit c384029ae415b9d2b8843eb1d0e399862dc6a576
Author: Gabor Greif <ggreif at gmail.com>
Date:   Thu Nov 30 20:49:03 2017 +0100

    Only look for locales of the form LL.VV
    
    Because in recent RHEL7 suddenly locales like `bokmål` pop up, which
    screw up reading-in of ASCII strings a line later. This additional
    criterion reliably eliminates those unicode characters.
    
    (cherry picked from commit abd5db6072218ada2b4a21177f5200ea0d3273a0)


>---------------------------------------------------------------

c384029ae415b9d2b8843eb1d0e399862dc6a576
 testsuite/driver/runtests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py
index 9f74494..db17f3b 100644
--- a/testsuite/driver/runtests.py
+++ b/testsuite/driver/runtests.py
@@ -151,7 +151,7 @@ else:
     h.close()
     if v == '':
         # We don't, so now see if 'locale -a' works
-        h = os.popen('locale -a', 'r')
+        h = os.popen('locale -a | grep -F .', 'r')
         v = h.read()
         h.close()
         if v != '':