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 47E8C138350 for ; Wed, 25 Mar 2020 19:18:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85979E0C4D; Wed, 25 Mar 2020 19:18:49 +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 64674E0C4D for ; Wed, 25 Mar 2020 19:18:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 400E634F2CD for ; Wed, 25 Mar 2020 19:18:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78F59186 for ; Wed, 25 Mar 2020 19:18:46 +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: <1585163783.2b3fc2be07ad897b7df6b77f79616c143a353275.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: 2b3fc2be07ad897b7df6b77f79616c143a353275 X-VCS-Branch: master Date: Wed, 25 Mar 2020 19:18:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 13e69219-2be9-4508-8a50-8ac36ac5a48f X-Archives-Hash: df4ba6a4ef5adce032f0ee056fe6f8ca commit: 2b3fc2be07ad897b7df6b77f79616c143a353275 Author: Zac Medico gentoo org> AuthorDate: Wed Mar 25 19:15:23 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 25 19:16:23 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2b3fc2be _lockfile_was_removed: always return tuple Fixes: 59e9452fda79 ("_lockfile_was_removed: return fstat result (bug 714480)") Signed-off-by: Zac Medico gentoo.org> lib/portage/locks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/locks.py b/lib/portage/locks.py index 71321e769..2331e6f57 100644 --- a/lib/portage/locks.py +++ b/lib/portage/locks.py @@ -419,7 +419,7 @@ def _lockfile_was_removed(lock_fd, lock_path): except OSError as e: if e.errno not in (errno.ENOENT, errno.ESTALE): _raise_exc(e) - return True + return (True, None) finally: try: os.unlink(hardlink_path)