chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FDroidPopen must have a locale to support UTF-8 filenames
[fdroidserver.git]
/
fdroidserver
/
common.py
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 732d18d2b6adc55222dc8ca2e67c57875abd89cb..2c2bb4e062b77472f7a2deb67d107897de7bc567 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-1794,7
+1794,8
@@
def set_FDroidPopen_env(build=None):
set up the environment variables for the build environment
There is only a weak standard, the variables used by gradle, so also set
set up the environment variables for the build environment
There is only a weak standard, the variables used by gradle, so also set
- up the most commonly used environment variables for SDK and NDK
+ up the most commonly used environment variables for SDK and NDK. Also, if
+ there is no locale set, this will set the locale (e.g. LANG) to en_US.UTF-8.
'''
global env, orig_path
'''
global env, orig_path
@@
-1806,6
+1807,15
@@
def set_FDroidPopen_env(build=None):
for k, v in config['java_paths'].items():
env['JAVA%s_HOME' % k] = v
for k, v in config['java_paths'].items():
env['JAVA%s_HOME' % k] = v
+ missinglocale = True
+ for k, v in env.items():
+ if k == 'LANG' and v != 'C':
+ missinglocale = False
+ elif k == 'LC_ALL':
+ missinglocale = False
+ if missinglocale:
+ env['LANG'] = 'en_US.UTF-8'
+
if build is not None:
path = build.ndk_path()
paths = orig_path.split(os.pathsep)
if build is not None:
path = build.ndk_path()
paths = orig_path.split(os.pathsep)