From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42E6F138330 for ; Wed, 14 Sep 2016 21:28:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16DD6E0979; Wed, 14 Sep 2016 21:28:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F205E0979 for ; Wed, 14 Sep 2016 21:28:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63D39340967 for ; Wed, 14 Sep 2016 21:28:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6570C247C for ; Wed, 14 Sep 2016 21:28:17 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1473888437.295d658510009cae54602aced9322702ec8c8180.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 295d658510009cae54602aced9322702ec8c8180 X-VCS-Branch: master Date: Wed, 14 Sep 2016 21:28:17 +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: c13e7019-7e10-4746-88e6-9477b4604747 X-Archives-Hash: 08d189d729576e6698f58df57ea991f1 commit: 295d658510009cae54602aced9322702ec8c8180 Author: Arfrever Frehtes Taifersar Arahesis gmail com> AuthorDate: Wed Sep 14 21:17:24 2016 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Sep 14 21:27:17 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=295d6585 config.environ: handle missing ctypes for check_locale (bug 584328) X-Gentoo-bug: 584328 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=584328 pym/portage/package/ebuild/config.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 45b7d08..7de4df7 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1,4 +1,4 @@ -# Copyright 2010-2015 Gentoo Foundation +# Copyright 2010-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import unicode_literals @@ -2790,7 +2790,8 @@ class config(object): if eapi_attrs.posixish_locale: split_LC_ALL(mydict) mydict["LC_COLLATE"] = "C" - if not check_locale(silent=True, env=mydict): + # check_locale() returns None when check can not be executed. + if check_locale(silent=True, env=mydict) is False: # try another locale for l in ("C.UTF-8", "en_US.UTF-8", "en_GB.UTF-8", "C"): mydict["LC_CTYPE"] = l