Gentoo Archives: gentoo-portage-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCHv2] emerge: Don't die when the user has an invalid locale setting
Date: Wed, 06 Aug 2014 21:39:20
Message-Id: 1407361154-2008-1-git-send-email-floppym@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH] emerge: Don't die when the user has an invalid locale setting by Mike Gilbert
1 Resolves bug 519074.
2 ---
3 pym/_emerge/main.py | 5 ++++-
4 1 file changed, 4 insertions(+), 1 deletion(-)
5
6 diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
7 index 1a920f7..52aa9c5 100644
8 --- a/pym/_emerge/main.py
9 +++ b/pym/_emerge/main.py
10 @@ -999,7 +999,10 @@ def emerge_main(args=None):
11 args = portage._decode_argv(args)
12
13 # Use system locale.
14 - locale.setlocale(locale.LC_ALL, '')
15 + try:
16 + locale.setlocale(locale.LC_ALL, '')
17 + except locale.Error as e:
18 + writemsg_level("setlocale: %s\n" % e, level=logging.WARN)
19
20 # Disable color until we're sure that it should be enabled (after
21 # EMERGE_DEFAULT_OPTS has been parsed).
22 --
23 2.0.4

Replies