[gentoo-portage-dev] [PATCH] EAPI 6: Enforce posixish LC_CTYPE

[Michał Górny]

---
 pym/portage/package/ebuild/config.py | 17 ++++++++++++++---
 pym/portage/util/locale.py           | 30 +++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 4d07638..dd437a9 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -24,7 +24,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.dep.soname.SonameAtom:SonameAtom',
 	'portage.dbapi.vartree:vartree',
 	'portage.package.ebuild.doebuild:_phase_func_map',
-	'portage.util.locale:split_LC_ALL',
+	'portage.util.locale:check_locale_env,split_LC_ALL',
 )
 from portage import bsd_chflags, \
 	load_mod, os, selinux, _unicode_decode
@@ -2770,9 +2770,20 @@ class config(object):
 			if phase_func is not None:
 				mydict["EBUILD_PHASE_FUNC"] = phase_func
 
-		if eapi_attrs.requires_posixish_locale:
+		if eapi_attrs.posixish_locale:
 			split_LC_ALL(mydict)
-			mysettings["LC_COLLATE"] = "C"
+			mydict["LC_COLLATE"] = "C"
+			if not check_locale_env(mydict):
+				# try another locale
+				for l in ("C.UTF-8", "en_US.UTF-8", "en_GB.UTF-8", "C"):
+					mydict["LC_CTYPE"] = l
+					if check_locale_env(mydict):
+						# TODO: output the following only once
+#						writemsg(_("!!! LC_CTYPE unsupported, using %s instead\n")
+#								% mydict["LC_CTYPE"])
+						break
+				else:
+					raise AssertionError("C locale did not pass the test!")
 
 		return mydict
 
diff --git a/pym/portage/util/locale.py b/pym/portage/util/locale.py
index 570f6f0..bcf05d1 100644
--- a/pym/portage/util/locale.py
+++ b/pym/portage/util/locale.py
@@ -9,7 +9,9 @@ get_ro_checker().
 """
 from __future__ import unicode_literals
 
+import locale
 import logging
+import os
 import textwrap
 
 from portage.util import writemsg_level
@@ -25,7 +27,7 @@ locale_categories = (
 )
 
 
-def check_locale():
+def check_locale(silent=False):
 	"""
 	Check whether the locale is sane. Returns True if it is, prints
 	warning and returns False if it is not. Returns None if the check
@@ -45,6 +47,9 @@ def check_locale():
 	ruc = [libc.toupper(c) for c in lc]
 
 	if lc != rlc or uc != ruc:
+		if silent:
+			return False
+
 		msg = ("WARNING: The LC_CTYPE variable is set to a locale " +
 			"that specifies transformation between lowercase " +
 			"and uppercase ASCII characters that is different than " +
@@ -72,6 +77,29 @@ def check_locale():
 	return True
 
 
+def check_locale_env(env):
+	"""
+	Check whether locale specified in passed environment variable dict
+	is sane. Wraps check_locale() in a subprocess.
+	"""
+	pid = os.fork()
+	if pid == 0:
+		try:
+			locale.setlocale(locale.LC_CTYPE,
+					env.get("LC_CTYPE", env.get("LANG", "C")))
+		except locale.Error:
+			os._exit(2)
+
+		ret = check_locale(silent=True)
+		if ret is not None and not ret:
+			os._exit(1)
+		os._exit(0)
+
+	pid2, status = os.waitpid(pid, 0)
+	assert pid == pid2
+	return os.WEXITSTATUS(status) == 0
+
+
 def split_LC_ALL(env):
 	"""
 	Replace LC_ALL with split-up LC_* variables if it is defined.
-- 
2.6.3