From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 682DF13877A for ; Sun, 10 Aug 2014 00:11:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1C80E0913; Sun, 10 Aug 2014 00:11:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 611D4E0893 for ; Sun, 10 Aug 2014 00:10:31 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BE50340053 for ; Sun, 10 Aug 2014 00:10:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id EA34418815 for ; Sun, 10 Aug 2014 00:10:27 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1407627482.d40b4f1b0b21de67286a47aa10632e40996f6d06.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: d40b4f1b0b21de67286a47aa10632e40996f6d06 X-VCS-Branch: master Date: Sun, 10 Aug 2014 00:10:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a56795f6-f88b-42b5-861f-f217fca966d1 X-Archives-Hash: 00b18d6215d5b8ebe468a24d9df26895 commit: d40b4f1b0b21de67286a47aa10632e40996f6d06 Author: Mike Gilbert gentoo org> AuthorDate: Wed Aug 6 21:39:14 2014 +0000 Commit: Brian Dolbec gmail 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).