sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.const] do not hardcode UTF-8 string, but rather use _ENCODING

Browse Source
This commit is contained in:
Fabio Erculiani
2012-02-27 19:35:15 +01:00
parent ba805a528f
commit a28a92c2a3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/entropy/const.py
+6 -6
View File
@@ -42,15 +42,15 @@ _ENCODING = "UTF-8"
default_enc = sys.getfilesystemencoding()
if default_enc is None:
default_enc = "ascii"
if default_enc.lower() != "utf-8":
default_locale = "en_US.UTF-8"
if default_enc.lower() != _ENCODING:
default_locale = "en_US." + _ENCODING
sys.stderr.write("""\
invalid filesystem encoding %s, must be UTF-8.
Make sure to set LC_ALL, LANG, LANGUAGE to valid UTF-8 values.
invalid filesystem encoding %s, must be %s.
Make sure to set LC_ALL, LANG, LANGUAGE to valid %s values.
Please execute:
LC_ALL=en_US.UTF-8 %s
LC_ALL=en_US.%s %s
Cannot automatically recover from this.
""" % (default_enc, ' '.join(sys.argv)))
""" % (default_enc, _ENCODING, _ENCODING, _ENCODING, ' '.join(sys.argv)))
# just nag from now, make possible to fix broken glibc
# raise SystemExit(1)