From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1169151-garchives=archives.gentoo.org@lists.gentoo.org> 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 569A8138359 for <garchives@archives.gentoo.org>; Thu, 7 May 2020 20:35:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8187DE08DC; Thu, 7 May 2020 20:35:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64D2CE08DC for <gentoo-commits@lists.gentoo.org>; Thu, 7 May 2020 20:35:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC0F234F2B7 for <gentoo-commits@lists.gentoo.org>; Thu, 7 May 2020 20:35:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 208201D6 for <gentoo-commits@lists.gentoo.org>; Thu, 7 May 2020 20:35:24 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> 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" <zmedico@gentoo.org> Message-ID: <1588883642.def3574d3fe9b944dd83e561462ccc6de6f90ff3.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/locks.py X-VCS-Directories: lib/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: def3574d3fe9b944dd83e561462ccc6de6f90ff3 X-VCS-Branch: master Date: Thu, 7 May 2020 20:35:24 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b790cfa0-a553-4967-841d-68b3190e9422 X-Archives-Hash: 7b6db5ad7f4db510d250b5bce4f8d11d commit: def3574d3fe9b944dd83e561462ccc6de6f90ff3 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu May 7 20:32:03 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu May 7 20:34:02 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=def3574d locks: translate surrogate from uname (bug 721402) Prevent an error like this when attempting to encode a surrogate: UnicodeEncodeError: 'utf-8' codec can't encode characters in position 20-22: surrogates not allowed Tested-by: Vladimir Varlamov <bes.internal <AT> gmail.com> Bug: https://bugs.gentoo.org/721402 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/locks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/portage/locks.py b/lib/portage/locks.py index 2331e6f57..535698dfe 100644 --- a/lib/portage/locks.py +++ b/lib/portage/locks.py @@ -1,5 +1,5 @@ # portage: Lock management code -# Copyright 2004-2019 Gentoo Authors +# Copyright 2004-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 __all__ = ["lockdir", "unlockdir", "lockfile", "unlockfile", \ @@ -516,7 +516,7 @@ def unlockfile(mytuple): def hardlock_name(path): base, tail = os.path.split(path) return os.path.join(base, ".%s.hardlock-%s-%s" % - (tail, os.uname()[1], os.getpid())) + (tail, portage._decode_argv([os.uname()[1]])[0], os.getpid())) def hardlink_is_mine(link, lock): try: @@ -672,7 +672,7 @@ def unhardlink_lockfile(lockfilename, unlinkfile=True): pass def hardlock_cleanup(path, remove_all_locks=False): - myhost = os.uname()[1] + myhost = portage._decode_argv([os.uname()[1]])[0] mydl = os.listdir(path) results = []