commit: d40b4f1b0b21de67286a47aa10632e40996f6d06
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 6 21:39:14 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Aug 9 23:38:02 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d40b4f1b
emerge: fix invalid locale setting (bug 519074)
Don't die when the user has an invalid locale setting.
Resolves bug 519074.
---
pym/_emerge/main.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 1a920f7..52aa9c5 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -999,7 +999,10 @@ def emerge_main(args=None):
args = portage._decode_argv(args)
# Use system locale.
- locale.setlocale(locale.LC_ALL, '')
+ try:
+ locale.setlocale(locale.LC_ALL, '')
+ except locale.Error as e:
+ writemsg_level("setlocale: %s\n" % e, level=logging.WARN)
# Disable color until we're sure that it should be enabled (after
# EMERGE_DEFAULT_OPTS has been parsed).
