From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S91cW-0006qn-Je for garchives@archives.gentoo.org; Sat, 17 Mar 2012 21:57:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3419E0439; Sat, 17 Mar 2012 21:56:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5D2B0E0439 for ; Sat, 17 Mar 2012 21:56:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F1461B4021 for ; Sat, 17 Mar 2012 21:56:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 515D2E5402 for ; Sat, 17 Mar 2012 21:56:50 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1332021397.141408ea103bb3217a9204577a26d4c0724401ad.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 141408ea103bb3217a9204577a26d4c0724401ad X-VCS-Branch: master Date: Sat, 17 Mar 2012 21:56:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c2ef2b80-ccf4-4eb7-a5e1-5edfb6137e33 X-Archives-Hash: a8121f4939cc66e5cb4a273aff150f3f commit: 141408ea103bb3217a9204577a26d4c0724401ad Author: Zac Medico gentoo org> AuthorDate: Sat Mar 17 21:56:37 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 17 21:56:37 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D141408ea Use eqawarn for install of non UTF-8 file names. This will fix bug #406749. --- pym/portage/dbapi/vartree.py | 3 ++- pym/portage/package/ebuild/doebuild.py | 18 +++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 6d354af..f1e74ae 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3581,7 +3581,8 @@ class dblink(object): break =20 if unicode_errors: - eerror(_merge_unicode_error(unicode_errors)) + self._elog("eqawarn", "preinst", + _merge_unicode_error(unicode_errors)) =20 if paths_with_newlines: msg =3D [] diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index 4ff3eea..5d2586b 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1805,7 +1805,7 @@ def _post_src_install_uid_fix(mysettings, out): =20 if unicode_errors: for l in _merge_unicode_error(unicode_errors): - eerror(l, phase=3D'install', key=3Dmysettings.mycpv, out=3Dout) + eqawarn(l, phase=3D'install', key=3Dmysettings.mycpv, out=3Dout) =20 build_info_dir =3D os.path.join(mysettings['PORTAGE_BUILDDIR'], 'build-info') @@ -2006,10 +2006,8 @@ def _post_src_install_soname_symlinks(mysettings, = out): def _merge_unicode_error(errors): lines =3D [] =20 - msg =3D _("This package installs one or more file names containing " - "characters that do not match your current locale " - "settings. The current setting for filesystem encoding is '%s'.") \ - % _encodings['merge'] + msg =3D _("QA Notice: This package installs one or more file names " + "containing characters that are not encoded with the UTF-8 encoding.") lines.extend(wrap(msg, 72)) =20 lines.append("") @@ -2017,16 +2015,6 @@ def _merge_unicode_error(errors): lines.extend("\t" + x for x in errors) lines.append("") =20 - if _encodings['merge'].lower().replace('_', '').replace('-', '') !=3D '= utf8': - msg =3D _("For best results, UTF-8 encoding is recommended. See " - "the Gentoo Linux Localization Guide for instructions " - "about how to configure your locale for UTF-8 encoding:") - lines.extend(wrap(msg, 72)) - lines.append("") - lines.append("\t" + \ - "http://www.gentoo.org/doc/en/guide-localization.xml") - lines.append("") - return lines =20 def _prepare_self_update(settings):